Dmitry Stogov
f7b6db7555
Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:09:45 +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
krakjoe
704866d6fd
opcodes
2013-12-22 13:20:41 +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
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
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
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
560f90e511
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h
2013-12-21 21:31:48 +01:00
Bob Weinand
7894e397d8
Fixed build...
2013-12-21 21:29:08 +01:00
Bob Weinand
b52c300eca
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-21 19:27:58 +01:00
Bob Weinand
50d50c2f04
Added an opcode to opcode name map
...
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
2013-12-21 19:22:47 +01:00
Boris Lytochkin
e195faa18f
Merge branch '5.5' into PHP-5.5
...
* 5.5:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 01:01:41 +04:00
Boris Lytochkin
a6fa52028f
Merge branch '5.4' into PHP-5.4
...
* 5.4:
keep 'em sorted
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 01:00:46 +04:00
Boris Lytochkin
a7c50ccc67
keep 'em sorted
2013-12-20 00:51:59 +04:00
Boris Lytochkin
324eb07440
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 00:37:29 +04:00
Boris Lytochkin
b65bd30e89
Merge branch '5.4' into 5.5
...
* 5.4:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:26:34 +04:00
Boris Lytochkin
bb51d0e4c0
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:25:16 +04:00
Derick Rethans
7a402ca51e
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-19 18:58:45 +00:00
Derick Rethans
e881334e49
- Updated to version 2013.9 (2013i)
2013-12-19 18:58:44 +00:00
Remi Collet
eda1cec694
NEWS
2013-12-19 10:56:07 +01:00
Remi Collet
32d1d5fb59
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:38 +01:00
Michael Wallner
391fe528b7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS handling section of README.GIT-RULES
2013-12-19 10:08:06 +01:00
Michael Wallner
3624a9ca7a
Update NEWS handling section of README.GIT-RULES
...
See http://marc.info/?t=138124004400005&r=1&w=2
2013-12-19 10:07:46 +01:00
Dmitry Stogov
16e95d9137
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:19:53 +04:00
Anatol Belski
5e5ecaea6e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed possibly uninitialized value usage
2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22
fixed possibly uninitialized value usage
2013-12-17 08:44:22 +01:00
Stanislav Malyshev
57408f9c85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:36:33 -08:00
Stanislav Malyshev
cbcf6e1880
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:34:24 -08:00
Dmitry Stogov
a67c615799
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fix tests expecting specific resource IDs
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
Updated release process
2013-12-16 13:13:29 +04:00
Xinchen Hui
7cf6f012b1
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
2013-12-15 16:55:11 +08:00
Eric Stenson
330168a247
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Anatol Belski
509a67d28f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed parameter order for zend_throw_exception_ex call
Fix doc (svn -> git)
2013-12-14 20:46:43 +01:00
Anatol Belski
68a73ce3c4
fixed parameter order for zend_throw_exception_ex call
2013-12-14 20:43:02 +01:00
DQNEO
1b3e2c299d
Fix doc (svn -> git)
2013-12-13 23:20:37 +02:00
Julien Pauli
47a0722b9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Updated release process
2013-12-13 13:27:19 +01:00
Julien Pauli
cbc98df99e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Updated release process
2013-12-13 13:26:16 +01:00
Julien Pauli
3eb2b1ac40
Updated release process
2013-12-13 13:16:54 +01:00
Dmitry Stogov
e6dbf0eeff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Use zend_error_noreturn here
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
2013-12-13 11:16:17 +04:00
Xinchen Hui
ef73f85079
Use zend_error_noreturn here
2013-12-13 10:56:35 +08:00
Xinchen Hui
dde552f2ee
Add Tests for #65784 in 5.5
2013-12-13 01:45:45 +08:00
Xinchen Hui
54213b462d
Disallowed JMP into a finally block.
2013-12-13 01:44:54 +08:00
Julien Pauli
3248b3c4d8
Update NEWS for 5.5.7 release
2013-12-12 17:16:13 +01:00
Dmitry Stogov
711d8c2c7b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix test
2013-12-12 16:46:49 +04:00
