Xinchen Hui
5a756afcf1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
Xinchen Hui
31d4d11432
Fix one more test in dos style eol
2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
Xinchen Hui
a88543a106
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
2013-12-30 10:51:47 +08:00
Xinchen Hui
04c8ce259f
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
...
Use git blame -w to ingore the space changes
2013-12-30 10:50:46 +08:00
Remi Collet
809eb77689
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
minor fix on previous
2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +01:00
Remi Collet
46809869a3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
Initial fix was PHP stuff
This one is libgd fix.
- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
2013-12-28 14:22:13 +01:00
Xinchen Hui
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
Dmitry Stogov
03a37de9b3
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
2013-12-26 14:47:13 +04:00
Anatol Belski
9f9179cc62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c
brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:29:42 +01:00
Xinchen Hui
d316040857
Fix test
2013-12-25 15:34:39 +08:00
Joe Watkins
e538c1ad3f
update credits headers
2013-12-24 09:03:22 +00: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
ccb29a6e41
Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:04:10 +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
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
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
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
Christopher Jones
794df91c35
Align 'configure --help' columns
2013-12-20 10:02:46 -08:00
Boris Lytochkin
285c0bcec0
Merge branch '5.5' into 5.6
...
* 5.5:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:39:15 +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
d4f4b66d43
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-19 19:01:00 +00: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
f6ffecbd2d
save a few memory
2013-12-19 10:55:26 +01:00
Remi Collet
99b91f98b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +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
Dmitry Stogov
436ca2d019
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
Conflicts:
NEWS
2013-12-18 19:21:21 +04: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
beed28844b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01: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
Xinchen Hui
eeb37c40e6
Save one char compare
2013-12-17 15:09:52 +08:00
Xinchen Hui
143ae34f29
Fixed test failed after rev 57c1335f
2013-12-17 15:05:31 +08:00
Stanislav Malyshev
de4a2c3cbd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08: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
Dmitry Stogov
43f11165b8
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' 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)
Test pushing
Updated release process
2013-12-16 13:13:18 +04:00