clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,287 Commits 494 Branches 1,367 Tags 802 MiB
d2798c6035
Commit Graph

2545 Commits

Author SHA1 Message Date
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
0a46d63f7e - Fixed expected test result (patch by ab@php.net in #61769) 2012-04-19 20:15:11 -03:00
Felipe Pena
d5bd45429c - Fix test title 2012-04-19 20:05:30 -03: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
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
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
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +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
Ilia Alshanetsky
edb57810a7 Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). 2012-03-19 13:10:23 -04:00
Xinchen Hui
40cd3d54b9 Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) 2012-03-11 08:56:14 +00:00
Xinchen Hui
0d076c3c77 Add Moriyoshi Koizumi and I to the cli SAPI credits 2012-03-11 08:41:40 +00:00
Rasmus Lerdorf
81d45bc204 And fix the test cases as well 2012-03-02 03:43:07 +00:00
Rasmus Lerdorf
16748fe0fa CLI Server was sending "Connection: closed" instead of "Connection: close" 2012-03-02 03:38:04 +00:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Rasmus Lerdorf
69f24fb502 Yup, these need to be escaped. Good catch. 2012-02-21 00:01:19 +00:00
Rasmus Lerdorf
cc813032cd Fix bug 61149 2012-02-20 20:29:26 +00:00
Dmitry Stogov
106e88b3db Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Michael Wallner
93c549913f fix usage of php_output_(de)activate; I guess this code doesn't bother about one more hack; 2012-01-31 10:47:21 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963 
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
 2012-01-31 09:58:26 +00:00
Rasmus Lerdorf
a5c3078c3f Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
6f27b1f1a6 Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Pierre Joye
d8c6dd182b - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Jérôme Loyet
b9fab77d13 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
c730ed9656 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
0ca9fbc0de - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Jérôme Loyet
e747222100 - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
George Wang
f9d84f4f6b fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:22 +00:00
George Wang
3c1df3349a fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:06 +00:00
Xinchen Hui
2217bba732 test for bug 60591 2011-12-22 08:08:52 +00:00
Xinchen Hui
77b97de8df Fix bug #60591 (Memory leak when access a non-exists file) 2011-12-22 07:39:44 +00:00
Xinchen Hui
80ab69876c Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) 2011-12-16 19:25:03 +00:00
Xinchen Hui
e29c46a50d add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
8fff0e86d7 fix memory leak 2011-12-09 14:05:26 +00:00
Xinchen Hui
147c414279 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +00:00
Pierre Joye
653e68233a - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +00:00
Felipe Pena
b7e84d6b83 - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Felipe Pena
7439154ece - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Pierrick Charron
3bfd03b6b6 Don't load php.ini file to test the built-in web server 2011-11-18 06:15:25 +00:00