Dmitry Stogov
|
7864fcaec9
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
Conflicts:
NEWS
|
2014-01-13 18:06:49 +04:00 |
|
Dmitry Stogov
|
ce2f024e9f
|
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
|
2014-01-13 18:05:21 +04:00 |
|
Dmitry Stogov
|
9b74dc4a07
|
Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
|
2014-01-13 16:16:23 +04:00 |
|
Dmitry Stogov
|
ca550248f1
|
Fixed bug #66471 (Keep backward compatibility)
|
2014-01-13 15:34:25 +04:00 |
|
Dmitry Stogov
|
d09d64c15c
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Conflicts:
NEWS
|
2014-01-13 12:07:50 +04:00 |
|
Dmitry Stogov
|
fcd75690fe
|
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
|
2014-01-13 12:06:19 +04:00 |
|
Johannes Schlüter
|
45d46d7edd
|
Merge branch 'PHP-5.5' into PHP-5.6
|
2014-01-10 16:02:46 +01:00 |
|
Johannes Schlüter
|
98e06a10d3
|
fix encoding
|
2014-01-10 15:57:40 +01:00 |
|
Anatol Belski
|
ec89e6bfe2
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed EOL in the test
|
2014-01-09 15:28:47 +01:00 |
|
Anatol Belski
|
4f115c0b7d
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed EOL in the test
|
2014-01-09 15:28:09 +01:00 |
|
Anatol Belski
|
b8774519e2
|
fixed EOL in the test
|
2014-01-09 15:27:26 +01:00 |
|
Anatol Belski
|
4fe9a5d611
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added testcase from bug #65371
|
2014-01-09 15:24:55 +01:00 |
|
Anatol Belski
|
418602adfb
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
added testcase from bug #65371
|
2014-01-09 15:24:31 +01:00 |
|
Anatol Belski
|
e927dbd1f6
|
added testcase from bug #65371
|
2014-01-09 15:23:49 +01:00 |
|
Dmitry Stogov
|
f16a4bc203
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
|
2014-01-09 13:49:54 +04:00 |
|
Dmitry Stogov
|
b5fbde9c5b
|
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
|
2014-01-09 13:48:08 +04:00 |
|
Anatol Belski
|
61e1f79585
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
one more extension for the basename test
|
2014-01-05 19:21:49 +01:00 |
|
Anatol Belski
|
748e707bf9
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
one more extension for the basename test
|
2014-01-05 19:21:27 +01:00 |
|
Anatol Belski
|
1c586d4070
|
one more extension for the basename test
|
2014-01-05 19:19:54 +01:00 |
|
Anatol Belski
|
e5dd5d0ad4
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improved the fix for bug #66395
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
|
2014-01-05 19:13:15 +01:00 |
|
Anatol Belski
|
3bde9cfd8d
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improved the fix for bug #66395
|
2014-01-05 19:12:52 +01:00 |
|
Anatol Belski
|
3f7f72adb2
|
improved the fix for bug #66395
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
|
2014-01-05 19:05:04 +01:00 |
|
Anatol Belski
|
f0100261e1
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66395 basename function doesn't remove drive letter
|
2014-01-03 22:38:47 +01:00 |
|
Anatol Belski
|
d3a053d9f4
|
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
|
2014-01-03 22:32:39 +01:00 |
|
Anatol Belski
|
46f60fae22
|
Fixed bug #66395 basename function doesn't remove drive letter
|
2014-01-03 22:25:58 +01:00 |
|
Xinchen Hui
|
4e2ae5f5ca
|
Here need to be str_efree
found by ext/standard/tests/general_functions/phpinfo2.php fails
|
2014-01-03 11:36:50 +08:00 |
|
Xinchen Hui
|
c081ce628f
|
Bump year
|
2014-01-03 11:08:10 +08:00 |
|
Xinchen Hui
|
47c9027772
|
Bump year
|
2014-01-03 11:06:16 +08:00 |
|
Xinchen Hui
|
c0d060f5c0
|
Bump year
|
2014-01-03 11:04:26 +08:00 |
|
Derick Rethans
|
110b7dcfb8
|
Merge branch 'PHP-5.5' into PHP-5.6
|
2014-01-02 12:47:44 +00:00 |
|
Derick Rethans
|
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 |
|
Derick Rethans
|
dee77f237c
|
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
|
2014-01-02 10:57:46 +00:00 |
|
Felipe Pena
|
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 |
|
Felipe Pena
|
49cdde7326
|
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
|
2014-01-01 09:56:31 -02:00 |
|
Felipe Pena
|
5967fb194f
|
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
|
2014-01-01 09:55:14 -02:00 |
|
Nikita Popov
|
5408f1e5a6
|
Throw warning when converting invalid string to GMP
|
2013-12-30 14:38:09 +01:00 |
|
Nikita Popov
|
71a36fb6ae
|
Merge branch 'PHP-5.5' into PHP-5.6
|
2013-12-30 13:58:29 +01:00 |
|
Nikita Popov
|
c7ee97eea0
|
Merge branch 'PHP-5.4' into PHP-5.5
|
2013-12-30 13:54:58 +01:00 |
|
Nikita Popov
|
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 |
|
Remi Collet
|
33ef788abd
|
missing file from libzip 0.11.2
|
2013-12-30 10:00:02 +01:00 |
|
Remi Collet
|
3a492cf686
|
fix compat for PHP ABI changes
|
2013-12-30 08:47:16 +01:00 |
|
Remi Collet
|
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 |
|
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 |
|