Joe Watkins
265fdd9139
credits file for phpdbg
2013-12-23 22:36:30 +00:00
Stanislav Malyshev
392f6830a1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
restore NEWS to the state of 6c5e93fe17
2013-12-23 14:10:44 -08:00
Stanislav Malyshev
571ac34393
restore NEWS to the state of 6c5e93fe17
2013-12-23 14:10:08 -08:00
krakjoe
7b215b36bc
reformat
2013-12-23 21:54:45 +00:00
krakjoe
2d82e994b6
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-23 21:52:32 +00:00
krakjoe
d82e7ee7f8
credits file
2013-12-23 21:52:22 +00:00
Dmitry Stogov
67eccf8617
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:54:54 +04:00
Dmitry Stogov
a00e7f22d2
Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:53:34 +04:00
Dmitry Stogov
fff72bc93b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:59 +04:00
Dmitry Stogov
bd88bed670
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:38 +04:00
Dmitry Stogov
209ec406ca
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:05:18 +04:00
Dmitry Stogov
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +04:00
Anatol Belski
f4a96983e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:26 +01:00
Anatol Belski
19039984e2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
Anatol Belski
3f7a145b5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:00:49 +01:00
Anatol Belski
f156e684ac
removed outdated IsDebuggerPresent declaration
...
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 11:53:47 +01:00
Dmitry Stogov
62fa84a031
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:11:22 +04:00
Dmitry Stogov
8650d2dda6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +04:00
Dmitry Stogov
5bc9e006e8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
fix news
opcodes
opcodes
Conflicts:
NEWS
2013-12-23 12:52:27 +04:00
Dmitry Stogov
f5c200fce9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
opcodes
2013-12-23 12:50:42 +04:00
Dmitry Stogov
0dcaf0f445
Fixed Issue #140 : "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
2013-12-23 12:46:30 +04:00
Sara Golemon
6a2a2b52f9
Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true()
2013-12-22 14:10:59 -08:00
krakjoe
befdd1770a
fix news
2013-12-22 14:34:29 +00:00
krakjoe
ee55edf5e4
fix news
2013-12-22 13:30:41 +00:00
krakjoe
523a6b50ae
fix news file
2013-12-22 13:27:38 +00:00
krakjoe
704866d6fd
opcodes
2013-12-22 13:20:41 +00:00
krakjoe
d455377fad
opcodes
2013-12-22 13:20:17 +00:00
krakjoe
8ce521a6a7
missing, apparently
2013-12-22 13:19:35 +00:00
krakjoe
df9f2ad2e9
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
2013-12-22 13:17:21 +00:00
krakjoe
621862a192
Merge branch 'PHP-5.6'
...
* PHP-5.6:
stop warnings from unused opcode map
- BFN
Conflicts:
NEWS
Zend/zend_vm_opcodes.h
2013-12-22 13:15:40 +00:00
krakjoe
2a1b60569f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
krakjoe
247ec0d81f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
stop warnings from unused opcode map
- BFN
2013-12-22 13:07:41 +00:00
krakjoe
b1df00a7c9
stop warnings from unused opcode map
2013-12-22 13:00:51 +00:00
Felipe Pena
c14388d63f
- BFN
2013-12-22 09:43:53 -02:00
Felipe Pena
e700cbff22
Merge branch 'PHP-5.6'
...
* PHP-5.6:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:29 -02:00
Felipe Pena
9f1075bb29
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:10 -02:00
Felipe Pena
8e36d36ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:42:45 -02:00
Bob Weinand
2bf271bbb0
Merge branch 'PHP-5.6'
2013-12-22 01:08:47 +01:00
Bob Weinand
0525dce3c8
Merge branch 'master' of sapi/phpdbg into PHP-5.6
2013-12-22 01:04:31 +01:00
Bob Weinand
5b1f6caaf0
Merge branch 'PHP-5.6'
2013-12-22 00:57:31 +01:00
Bob Weinand
129fb22b37
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:55:46 +01:00
Bob Weinand
7e3af096b3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
Bob Weinand
97bf254385
Included new .c file in build too
2013-12-22 00:52:05 +01:00
Bob Weinand
2874eba714
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:54:38 +01:00
Bob Weinand
00cc4dccb8
Fixed little typo in zend_vm_gen.php
2013-12-21 23:52:48 +01:00
Bob Weinand
0dd2765687
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:49:28 +01:00
Bob Weinand
61199be02f
Moved to new file, killing a lot of warnings
2013-12-21 23:45:34 +01:00
Bob Weinand
20318c4960
Added breaking upon fatal-ish error
2013-12-21 22:42:11 +01:00