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
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
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
4ff1126846
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
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
024420e90b
Add Moriyoshi Koizumi and I to the cli SAPI credits
2012-03-11 08:41:40 +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
730b54a374
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
bdbcc1789d
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
Nikita Popov
0a91432828
Fix cli server tests broken by r323078
...
Needs to be merged to 5.4 after r323078 is merged.
2012-02-18 11:59:13 +00:00
Dmitry Stogov
106e88b3db
Fixed reinitialization of SAPI callbacks after php_module_startup()
2012-02-14 13:31:23 +00:00
Dmitry Stogov
2e94124494
Fixed reinitialization of SAPI callbacks after php_module_startup()
2012-02-14 13:31:23 +00:00
Gustavo André dos Santos Lopes
6af0bdc2a3
- Connection: close, not "closed".
2012-02-05 11:45:01 +00:00
Dmitry Stogov
87c038be06
Always restore PG(magic_quote_gpc) on request shutdown
2012-02-02 12:58:54 +00:00
Michael Wallner
7aedbed543
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
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
Michael Wallner
29c8658dc8
fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by
2012-01-31 08:51:24 +00:00
Rasmus Lerdorf
a5c3078c3f
Missing ifdef here
...
Fixes bug 60811
2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
5d90aa1299
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
3893b152ed
- any other dir may not exist or may not be used
2012-01-10 07:33:36 +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
0a67d26633
- Fixed bug #60659 (FPM does not clear auth_user on request accept)
2012-01-04 21:18:26 +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
0eb2eec938
- 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
8775a37559
- 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