68c9f5d84c
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:52:20 +00:00
405f6417f1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-02 12:52:08 +00:00
110b7dcfb8
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:47:44 +00:00
5137cb5f0c
Fixed (some of) add/sub.
...
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
2014-01-02 12:45:48 +00:00
dee77f237c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-02 10:57:46 +00:00
9eb7997852
- BFN
2014-01-01 22:33:12 -02:00
8a7e2f8dd2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:06 +00:00
e9195018dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:00:29 +00:00
3c3ff43432
fix #66375 bad logic in sapi header callback routine
2014-01-01 12:58:18 +00:00
37897e258d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:56:49 -02:00
49cdde7326
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2014-01-01 09:56:31 -02:00
5967fb194f
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:55:14 -02:00
5408f1e5a6
Throw warning when converting invalid string to GMP
2013-12-30 14:38:09 +01:00
feb4caad09
update php.ini-*
2013-12-30 14:28:43 +01:00
4797f7ad16
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
2013-12-30 14:28:43 +01:00
729f85fad7
add 'never'
2013-12-30 14:28:43 +01:00
7762de4022
fix type
2013-12-30 14:28:43 +01:00
cea59a74a7
fix type; add tests for -1
2013-12-30 14:28:42 +01:00
4153c23efa
s/BOOLEAN/ENTRY/
2013-12-30 14:28:42 +01:00
3641507fc1
re-introduce always_populate_raw_post_data
2013-12-30 14:28:42 +01:00
71a36fb6ae
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 13:58:29 +01:00
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
3b6afb1bd6
Fix leak caused by fix to bug #65667
...
ftp->stream is now closed in the ftp resource dtor.
2013-12-30 13:53:12 +01:00
33ef788abd
missing file from libzip 0.11.2
2013-12-30 10:00:02 +01:00
3a492cf686
fix compat for PHP ABI changes
2013-12-30 08:47:16 +01:00
41cdb132c8
NEWS
2013-12-30 07:45:09 +01:00
0a950a0500
Sync with pecl/zip 1.12.4dev
...
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex
2013-12-30 07:35:30 +01:00
5a756afcf1
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 11:07:37 +08:00
ed5be4f7ad
Fix test fail
2013-12-30 11:07:25 +08:00
31d4d11432
Fix one more test in dos style eol
2013-12-30 10:58:40 +08:00
f204df9a7f
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:58:23 +08:00
6699b1f8ea
Fix dos style eol in phpts
2013-12-30 10:58:01 +08:00
a88543a106
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
2013-12-30 10:51:47 +08:00
a8548d9765
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-30 10:51:36 +08:00
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
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
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +01:00
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
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
c8dedaf2dc
update version output
2013-12-27 18:03:11 +00:00
a8cd9b417c
Fixed bug #66358 (fpm starts segfault)
2013-12-27 20:45:43 +08:00
6908dc3e97
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:11:35 +08:00
aba76f09fa
Revert accidented committed php_version.h
2013-12-27 14:10:55 +08:00
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
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
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
0ff0e82f26
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Conflicts:
NEWS
2013-12-26 11:52:39 +04:00
6414fe283e
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:51:32 +04:00
1e411ebdf5
fix c89 compat
2013-12-25 23:43:20 +01:00
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
Derick Rethans