b811bb3920
added skip condition for powershell requirement of test
2015-06-27 15:02:52 +02:00
0730fc8830
updated NEWS
2015-06-27 14:32:34 +02:00
1920ba6f7b
Fix #64878 : 304 responses return Content-Type header
...
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
2015-06-27 14:28:33 +02:00
6400ef192c
added regression test for bug #69679
...
DOMDocument::loadHTML refuses to accept NULL bytes.
2015-06-27 01:08:56 +02:00
bdf3bb668f
slightly revised bug69462.phpt
2015-06-26 23:20:22 +02:00
af17316fcd
Test for bug #69462
...
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
2015-06-26 23:19:29 +02:00
2ff3dafccf
Fixed #69882 : OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
...
Squashed commit of the following:
commit a64c1d9bc4falundir@gmail.com >
Date: Wed Jun 24 08:49:37 2015 +0200
Fix #69882 : OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
The "key values mismatch" error is triggered in openssl_pkcs12_read by
PKCS12_parse, because it uses X509_check_private_key to separate main
certificate (which corresponds to private key) from extra certificates.
Extra certificates usually comes first (p12 contents are reversed as
stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
error.
The fix pops "key values mismatch" error from OpenSSL error stack for
each extra certificate if there are any.
2015-06-26 05:33:28 +08:00
b1ec4515b0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unknown size of void error
2015-06-25 19:13:20 +02:00
80f9a9725c
fix unknown size of void error
2015-06-25 19:12:26 +02:00
7bb52dda6a
backport missing rev bfdc9e2805
2015-06-25 11:34:04 +02:00
1efe5b1157
5.6.12 next
2015-06-25 00:21:45 +02:00
ca82114f21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.28 now - Security Only
Conflicts:
configure.in
main/php_version.h
2015-06-24 10:42:41 +02:00
8e440dc1d7
5.5.28 now - Security Only
2015-06-24 10:41:06 +02:00
c201b63873
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Made bug44295-win.phpt locale independent
2015-06-24 01:42:22 +02:00
cd068b1ed6
Made bug44295-win.phpt locale independent
...
Formerly it failed on non English installations.
2015-06-24 01:41:33 +02:00
e181931f77
updated NEWS
2015-06-24 00:42:24 +02:00
905c5f4858
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
2015-06-24 00:32:13 +02:00
b03f743e7d
updated NEWS
2015-06-24 00:31:07 +02:00
8da8dc04b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #69768 (escapeshell*() doesn't cater to !)
bump API version to 6.8
2015-06-24 00:23:39 +02:00
921544cad9
updated NEWS
2015-06-24 00:20:32 +02:00
a621781fdb
Fixed bug #69768 (escapeshell*() doesn't cater to !)
...
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
2015-06-24 00:15:55 +02:00
13347225ac
updated NEWS
2015-06-23 19:36:59 +02:00
e1561c490e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:32:57 +02:00
1cbcbcbc21
updated NEWS
2015-06-23 19:32:18 +02:00
23e25f3319
Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
...
When advancing after empty matches, php_pcre_match_impl() as well as
php_pcre_replace_impl() always have to advance to the next code point when the
u modifier is given, instead of to the next byte.
2015-06-23 19:28:09 +02:00
868b9328a0
Moved NEWS entry for bug #69864 to proper category
2015-06-23 17:30:31 +02:00
b883fe1547
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Moved NEWS entry for bug #69864 to proper category
2015-06-23 17:28:22 +02:00
eef6b10b7c
Moved NEWS entry for bug #69864 to proper category
2015-06-23 17:27:21 +02:00
7953ff4ea3
updated NEWS
2015-06-23 16:43:12 +02:00
bc47f10a97
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23 16:36:35 +02:00
3e1aabbfc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
bump API version to 6.8
2015-06-23 16:22:08 +02:00
9bcdd2aabe
Fixed two errors in LDAP tests
2015-06-23 16:09:56 +02:00
75b2ce28aa
updated NEWS
2015-06-23 13:02:08 +02:00
a39beaa251
Fixed bug #69864 (Segfault in preg_replace_callback)
...
When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.
2015-06-23 13:00:17 +02:00
9e15ce9a38
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2015-06-22 23:40:34 -04:00
b0954ebb79
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2015-06-22 23:39:53 -04:00
3a169f6c0d
bump API version to 6.8
2015-06-22 23:39:35 -04:00
8877feaeec
bump API version to 6.8
2015-06-22 23:39:23 -04:00
fdb580a5ad
bump API version to 6.8
2015-06-22 23:38:38 -04:00
e09d3155a1
Merge branch 'PHP-5.5' into PHP-5.6
2015-06-20 16:40:53 +02:00
5fe078abba
Fixed bug #69892
2015-06-20 16:40:14 +02:00
bca005c8d9
Merge branch 'PHP-5.5' into PHP-5.6
2015-06-19 09:35:52 +08:00
6a8db93115
Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5
2015-06-19 09:35:28 +08:00
962fe01473
update NEWS
2015-06-18 22:04:03 +02:00
657f93e7b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:03:28 +02:00
c0119ca7f3
updated NEWS
2015-06-18 22:02:37 +02:00
a85156db7d
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:01:20 +02:00
1edb2e9a10
Remove excess variable in mail.c (5.5 branch)
2015-06-18 20:06:08 +03:00
3930e1f2fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:35:54 +03:00
ca33ae3eb2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:34:53 +03:00
Christoph M. Becker