87fa84abde
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-05-08 19:35:13 +02:00
c12fdbde5f
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
...
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
2012-05-08 19:31:41 +02:00
057f4719d3
c++ comments
2012-05-08 10:19:24 -07:00
1919ec5a55
restore BC
2012-05-08 10:19:24 -07:00
bd8912e47c
ws + restore BC to apache_request_headers
2012-05-08 10:19:23 -07:00
20364bcff9
fix bug #61807 - Buffer Overflow in apache_request_headers
2012-05-08 10:19:23 -07:00
0b4d7a455d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated NEWS
2012-05-08 18:52:48 +02:00
838b4b8ff7
updated NEWS
2012-05-08 18:51:49 +02:00
4b307984df
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61713 check also that mbstring's found any internal_encoding
2012-05-08 18:34:32 +02:00
d776a933eb
Fix bug 61713 check also that mbstring's found any internal_encoding
2012-05-08 18:31:11 +02:00
8987ad5cb2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
2012-05-08 18:14:38 +02:00
3a4a25358f
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
...
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
2012-05-08 17:42:01 +02:00
e8e661128a
Fix #61704 (Crash apache, phpinfo() threading issue)
2012-05-08 17:30:05 +02:00
fb3b6bcf83
Fix folding marks
2012-05-08 15:18:33 +02:00
340091469a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
This will be PHP 5.3.14
improve fix for CVE-2012-1823
2012-05-08 11:49:50 +02:00
e120a0c7f3
This will be PHP 5.3.14
2012-05-08 11:28:15 +02:00
b50101764b
improve fix for CVE-2012-1823
2012-05-07 12:14:57 -07:00
000e84aa88
improve fix for CVE-2012-1823
2012-05-07 12:14:21 -07:00
09664063a8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:40:16 +02:00
2068419ae5
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
2012-05-07 15:39:07 +02:00
ce59121c5f
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:37:29 +02:00
87a011d372
Fix bug 61769 Random failure of php_cli_server*phpt tests
2012-05-06 18:05:02 +02:00
ad3a42c26c
correct variable name
2012-05-06 20:37:03 +08:00
376635cde8
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-06 20:32:15 +08:00
99076bc24f
Change the test folder
2012-05-06 20:31:40 +08:00
4cceeb25b7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:28:18 +08:00
7ccd594392
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:01:10 +08:00
bef6111609
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:33:47 +02:00
304ac568c5
Add NEWS entry for bug #61961
2012-05-06 13:19:17 +02:00
311ee8f69c
Merge branch 'pull-request/76' into PHP-5.3
2012-05-06 12:45:45 +02:00
3e9923dd8d
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 18:27:26 +08:00
0747b29bdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
correct NEWS
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
Conflicts:
ext/curl/interface.c
2012-05-06 00:52:51 +08:00
4632fe0eef
correct NEWS
2012-05-06 00:51:20 +08:00
19632ae7dc
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
2012-05-06 00:50:37 +08:00
035ce937e1
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
2012-05-06 00:40:49 +08:00
948ab62c25
Merge branch 'PHP-5.3' into PHP-5.4
...
By Rasmus Lerdorf
* PHP-5.3:
Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d
2012-05-05 17:36:55 +02:00
168e8920be
Fix for CVE-2012-1823
...
(cherry picked from commit 29300b1f9d
2012-05-05 17:34:07 +02:00
0556103f6a
Fix for CVE-2012-1823
2012-05-04 11:58:24 -07:00
f5936cceeb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:42:05 +02:00
8a10259642
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:40:49 +02:00
16fdf86ea3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:32:12 +02:00
6c12252790
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:29:49 +02:00
31ab04ee25
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bump to next version
Conflicts:
configure.in
main/php_version.h
2012-05-03 12:22:39 -07:00
0956c00af9
Bump to next version
...
Bump PHP version number
2012-05-03 12:03:49 -07:00
72f19e9a8b
Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config)
2012-05-03 22:39:53 +08:00
d74d88fbb9
Fixed test bug #61892
2012-05-03 19:56:49 +08:00
75d23f5714
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
...
* origin/PHP-5.3:
Fix typo
2012-05-03 18:40:57 +08:00
bbf8a50281
Fix typo
...
picked form pull request of reeze.xia@gmail.com
2012-05-03 18:39:03 +08:00
cdce62b724
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
2012-05-02 21:41:33 +02:00
69ed09a31c
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
...
openssl needs explicit openssl.cnf on windows
2012-05-02 21:38:32 +02:00
Anatoliy Belsky