99b01fb3d7
ws fix
2014-04-14 13:35:59 -07:00
84fcc44083
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-04-14 23:11:16 +03:00
1bd3841132
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix null byte in LDAP bindings
Fix bug #66171 : better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171 : better handling of symlinks
2014-04-14 10:51:34 -07:00
59900dd37f
Fix null byte in LDAP bindings
2014-04-14 10:51:32 -07:00
41569b1029
Fix bug #66171 : better handling of symlinks
2014-04-14 10:51:31 -07:00
5b8c4b8de5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix null byte in LDAP bindings
Fix bug #66171 : better handling of symlinks
2014-04-14 10:46:52 -07:00
ed4de188dd
Fix null byte in LDAP bindings
2014-04-14 10:46:46 -07:00
7f43aeb167
Fix bug #66171 : better handling of symlinks
2014-04-14 10:46:45 -07:00
ad1b9eef98
Fix null byte in LDAP bindings
2014-04-14 10:44:53 -07:00
40a9316dff
Fix bug #66171 : better handling of symlinks
2014-04-14 10:44:53 -07:00
9e76e87ca9
fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:44:47 +02:00
ce99f292de
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt
2014-04-14 17:44:13 +03:00
2b28fd9ab0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backported some ext/intl tests from 5.6 into 5.4
2014-04-14 16:42:51 +02:00
dae70a2ff7
Add test
2014-04-14 17:35:01 +03:00
f6db1057fd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
backported some ext/intl tests from 5.6 into 5.4
Conflicts:
ext/intl/tests/collator_get_sort_key_variant2.phpt
ext/intl/tests/locale_get_display_name3.phpt
2014-04-14 16:34:08 +02:00
4268504084
backported some ext/intl tests from 5.6 into 5.4
2014-04-14 16:31:18 +02:00
d483e1daca
test fixes for ICU 53.1
2014-04-14 15:34:32 +02:00
e3abcf7826
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:49 +02:00
57d657987d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:31 +02:00
95c57bb646
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:32:31 +02:00
cfe24a7be2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS
2014-04-13 20:17:14 -07:00
6e81f80a1e
MErge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2014-04-13 20:16:54 -07:00
b80243aece
fix NEWS
2014-04-13 20:16:27 -07:00
7c9209a0d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:16 -07:00
9bba219c75
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:55:28 -07:00
5e66ce9293
Merge branch 'pull-request/518' into PHP-5.4
...
* pull-request/518:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:50:39 -07:00
0d4c28f2e1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64604
2014-04-13 18:39:17 -07:00
30ec1c0051
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64604
2014-04-13 18:38:36 -07:00
b05c088a3a
Fixed bug #64604
2014-04-13 18:37:40 -07:00
1ef0bd2633
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:52 -07:00
f1206aef70
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:09 -07:00
5558d0db9b
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
...
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
2014-04-13 18:12:17 -07:00
c1d5937f7f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:32:42 -07:00
5811610d71
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:31:44 -07:00
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
04a11b850a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix windows build
2014-04-13 17:04:00 -07:00
df8e34bcc1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix windows build
2014-04-13 17:03:28 -07:00
3a2660b302
Fix windows build
2014-04-13 17:02:21 -07:00
d3c4292db7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66721
2014-04-13 15:55:45 -07:00
733b09442d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66721
2014-04-13 15:55:07 -07:00
8c88b6e81c
Fix bug #66721
...
Add NULL check to php_date_parse_tzfile's retval
2014-04-13 15:51:55 -07:00
1be29a404a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:39:32 -07:00
c5275b4a92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:37:55 -07:00
442264ffd6
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:36:43 -07:00
3aab84c100
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:25:58 -07:00
fe72caa6e5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:23:32 -07:00
1010200da5
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:17:04 -07:00
a93e734f81
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-14 00:08:36 +02:00
0e023e9784
Bug #66840 : Fix broken build when extension built separately
2014-04-13 15:17:50 -06:00
bf3edbada6
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 23:03:53 +02:00
Stanislav Malyshev