Stanislav Malyshev
08779069e8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
c++ comments
restore BC
ws + restore BC to apache_request_headers
fix bug #61807 - Buffer Overflow in apache_request_headers
2012-05-08 10:21:10 -07:00
Stanislav Malyshev
057f4719d3
c++ comments
2012-05-08 10:19:24 -07:00
Stanislav Malyshev
1919ec5a55
restore BC
2012-05-08 10:19:24 -07:00
Stanislav Malyshev
bd8912e47c
ws + restore BC to apache_request_headers
2012-05-08 10:19:23 -07:00
Stanislav Malyshev
20364bcff9
fix bug #61807 - Buffer Overflow in apache_request_headers
2012-05-08 10:19:23 -07:00
Stanislav Malyshev
b50101764b
improve fix for CVE-2012-1823
2012-05-07 12:14:57 -07:00
Stanislav Malyshev
857fc1b473
Merge branch 'PHP-5.4'
...
* PHP-5.4:
improve fix for CVE-2012-1823
Fix for CVE-2012-1823
2012-05-07 12:12:48 -07:00
Stanislav Malyshev
36587ff335
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
improve fix for CVE-2012-1823
Fix for CVE-2012-1823
2012-05-07 12:10:36 -07:00
Stanislav Malyshev
7de4b75f74
improve fix for CVE-2012-1823
2012-05-07 12:08:36 -07:00
Rasmus Lerdorf
004941af15
Fix for CVE-2012-1823
2012-05-07 12:06:45 -07:00
Anatoliy Belsky
692cc976ca
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug 61769 Random failure of php_cli_server*phpt tests
2012-05-06 18:06:12 +02:00
Matt Ficken
87a011d372
Fix bug 61769 Random failure of php_cli_server*phpt tests
2012-05-06 18:05:02 +02:00
Xinchen Hui
067fad1b52
Merge branch 'PHP-5.4'
...
* PHP-5.4:
correct variable name
2012-05-06 20:37:33 +08:00
Xinchen Hui
ad3a42c26c
correct variable name
2012-05-06 20:37:03 +08:00
David Soria Parra
d3a13c2a10
Merge branch 'PHP-5.4'
...
By Rasmus Lerdorf
* PHP-5.4:
Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d
)
Fix for CVE-2012-1823
2012-05-05 17:37:35 +02:00
Rasmus Lerdorf
0556103f6a
Fix for CVE-2012-1823
2012-05-04 11:58:24 -07:00
Xinchen Hui
2de316ae8b
Merge remote-tracking branch 'origin/PHP-5.4'
...
* origin/PHP-5.4:
Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
- BFN
- BFN
2012-04-30 12:16:50 +08:00
Xinchen Hui
fd518ffc7e
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
...
* origin/PHP-5.3:
Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
- BFN
Conflicts:
sapi/cli/php_cli.c
2012-04-30 12:15:43 +08:00
Xinchen Hui
bae56a87f8
Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
2012-04-30 12:09:22 +08:00
Xinchen Hui
652fdbe789
Merge branch 'PHP-5.4'
...
* PHP-5.4:
typo in test
2012-04-21 10:16:08 +08:00
Xinchen Hui
8d44b91731
typo in test
2012-04-21 10:15:35 +08:00
Xinchen Hui
303c52b54d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Make css string constant
2012-04-21 09:31:45 +08:00
Xinchen Hui
b999e91f5b
Make css string constant
2012-04-21 09:31:00 +08:00
Xinchen Hui
465e9a1321
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed typo
2012-04-21 00:12:10 +08:00
Xinchen Hui
da85337d13
Fixed typo
...
report by reeze.xia@gmail.com
2012-04-21 00:11:06 +08:00
Xinchen Hui
a9d54e77c6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Improved performance while sending error page
- BFN
2012-04-21 00:02:12 +08:00
Xinchen Hui
cc58373d4d
Improved performance while sending error page
...
this also fixed bug #61785 (Memory leak when access a non-exists file without router)
2012-04-21 00:01:10 +08:00
Felipe Pena
47cff264df
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:14:00 -03:00
Felipe Pena
d2798c6035
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:13:37 -03:00
Felipe Pena
c3b0fb4fbe
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:12:47 -03:00
Felipe Pena
77f43a0770
Merge branch 'PHP-5.4'
2012-04-19 20:15:26 -03:00
Felipe Pena
0a46d63f7e
- Fixed expected test result (patch by ab@php.net in #61769 )
2012-04-19 20:15:11 -03:00
Felipe Pena
e104d3fb6e
Merge branch 'PHP-5.4'
2012-04-19 20:07:37 -03:00
Felipe Pena
d5bd45429c
- Fix test title
2012-04-19 20:05:30 -03:00
Xinchen Hui
65062b47f3
Fix bug #61430 for trunk
2012-04-17 11:23:28 +08:00
Xinchen Hui
06290cc049
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61605 (header_remove() does not remove all headers)
Conflicts:
NEWS
2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242
Fixed bug Fixed bug #61605 (header_remove() does not remove all headers)
2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df
Fixed bug #61605 (header_remove() does not remove all headers)
2012-04-04 16:01:43 +08:00
Gustavo André dos Santos Lopes
2d2995f343
Fixed bug #61043 : Regression in magic_quotes_gpc fix (CVE-2012-0831)
...
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3
Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
2012-03-21 21:12:31 +00:00
David Soria Parra
443e3b4c93
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61461 (missing checks around malloc() calls).
Conflicts:
NEWS
2012-03-21 12:15:33 +01:00
Ondřej Surý
d1fd5432e1
Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
2012-03-21 08:44:59 +01:00
Ilia Alshanetsky
9dcfb8c73f
Fixed bug #61461 (missing checks around malloc() calls).
2012-03-20 21:07:08 -04:00
David Soria Parra
6e7284fb5b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
Xinchen Hui
1a42558832
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Minor change, test using php mail address as account
2012-03-20 15:42:25 +08:00
Xinchen Hui
e1931dd1ad
Minor change, test using php mail address as account
2012-03-20 15:41:43 +08:00
Xinchen Hui
a0d149bc50
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Use newdoc instead of escape char
adapt makedist to git
2012-03-20 15:27:41 +08:00
Xinchen Hui
30bd2494a2
Use newdoc instead of escape char
2012-03-20 15:26:58 +08:00
Ilia Alshanetsky
5709f7dd5b
Merge branch '53' into 54
...
* 53:
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
2012-03-19 13:10:53 -04:00