Stanislav Malyshev
000e84aa88
improve fix for CVE-2012-1823
2012-05-07 12:14:21 -07:00
Rasmus Lerdorf
168e8920be
Fix for CVE-2012-1823
...
(cherry picked from commit 29300b1f9d
2012-05-05 17:34:07 +02: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
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
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
David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01: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
Christopher Jones
949ef40139
Fixed bug #61172 (Add Apache 2.4 support)
2012-03-02 00:07: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
87c038be06
Always restore PG(magic_quote_gpc) on request shutdown
2012-02-02 12:58:54 +00:00
Rasmus Lerdorf
6f27b1f1a6
Missing ifdef here
...
Fixes bug 60811
2012-01-19 22:35:22 +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
0ca9fbc0de
- 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
George Wang
3c1df3349a
fixed a crash in cli mode when apache_request_headers() is called
2011-12-31 18:15:06 +00:00
Felipe Pena
b7e84d6b83
- Removed C++ comment style
2011-11-19 12:16:47 +00:00
George Wang
56728f11a8
keep code to be compatible with PHP4
2011-11-16 03:58:57 +00:00
George Wang
badd6a91d4
keep PHP_5_4 in sync with PHP_5_3 branch
2011-11-16 03:44:42 +00:00
Jérôme Loyet
e5ccae408e
- Added .phar to default authorized extensions
2011-11-16 00:21:38 +00:00
Jérôme Loyet
bc169ba823
- FR #60199 (enhance FPM error log when the primary script can't be open)
2011-11-15 22:29:59 +00:00
Jérôme Loyet
0e25118cc4
- Fixed bug #60179 (php_flag and php_value does not work properly)
2011-11-03 15:47:19 +00:00
Xinchen Hui
a391535e00
Fixed bug #60206 (possible integer overflow in content_length)
2011-11-03 07:26:09 +00:00
Ferenc Kovacs
263ab7e2d4
stream_socket_server("unix://..." has a length limit, so it is better to use the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106
2011-10-22 21:44:05 +00:00
Ferenc Kovacs
8bbbfadcfe
there is a length limit on the shebang line, ignore the tests for >= 127
2011-10-20 18:09:44 +00:00
Jérôme Loyet
92039e00b0
- ensure request_terminate_timeout >= request_slowlog_timeout
2011-10-09 15:21:06 +00:00
Jérôme Loyet
f58cf75068
- Fixed bug #55526 (Heartbeat causes a lot of unnecessary events)
2011-10-09 15:12:26 +00:00
Jérôme Loyet
3982cda83b
- Fixed bug #55533 (The -d parameter doesn't work)
2011-10-09 14:36:11 +00:00
Jérôme Loyet
e7c6f9c62d
- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)
2011-10-08 21:04:10 +00:00
Jérôme Loyet
95bd5f1872
- fix r317913
2011-10-08 20:43:12 +00:00
Jérôme Loyet
0c2752169c
- Fixed bug #55486 (status show BIG processes number)
2011-10-08 19:50:26 +00:00
Jérôme Loyet
4d554c45b9
- Fixed bug #55577 (status.html does not install)
2011-10-08 19:31:32 +00:00
Jérôme Loyet
dd243e5c75
ws
2011-10-08 14:11:37 +00:00
Jérôme Loyet
509629d8b5
- Backported from 5.4 branch (Dropped restriction of not setting the same value multiple times, the last one holds).
2011-10-08 14:07:47 +00:00
Jérôme Loyet
4e396d7333
- Backported from 5.4 branch:
...
* enhanced log messages
* code cosmetic
2011-10-08 14:04:09 +00:00
Jérôme Loyet
93c3c0abfa
- Backported from 5.4 branch (order fpm configuration items the same way in php-fpm.conf.in, fpm_conf.h and fpm_conf.c)
2011-10-08 14:00:07 +00:00
Jérôme Loyet
7fc36a5210
- Backported from 5.4 branch (don't write directly to stderr, use the internal logger instead (zlog))
2011-10-08 13:57:31 +00:00
Jérôme Loyet
4ef746ae25
remove unused variable
2011-10-08 13:53:49 +00:00
Jérôme Loyet
9018d9434e
- backparted from 5.4 branch (remove is_fastcgi because FPM is always fastcgi)
2011-10-08 13:52:27 +00:00
Jérôme Loyet
c6b633a32a
- Backported FR #55166 from 5.4 branch (Added process.max to control the number of process FPM can fork)
2011-10-08 13:47:52 +00:00
Jérôme Loyet
c4e961f06e
- Backported FR #55181 from 5.4 branch (Enhance security by limiting access to user defined extensions)
2011-10-08 13:42:31 +00:00
Jérôme Loyet
a0f2d34b19
- Backported FR #54098 from 5.4 branch (Lowered process manager default value)
2011-10-08 13:38:28 +00:00
Jérôme Loyet
eccb940419
- Backported FR #52052 from 5.4 branch (Added partial syslog support)
2011-10-08 13:35:03 +00:00
Jérôme Loyet
4a0cd3946f
- commit r312812 again (dropped in r312913):
...
Implemented FR #54577 (Enhanced status page with full status and details
about each processes. Also provide a web page (status.html) for
real-time FPM status.
2011-10-08 13:29:14 +00:00
Christopher Jones
04b5bb7d3c
Update log, marking 5.4 and trunk as XFAIL due to bug #55496
2011-08-23 20:59:10 +00:00
Uwe Schindler
2c0ab6fc33
Bug #55403 : Don't set $_SERVER['HTTPS'] on unsecure connection
2011-08-18 19:12:49 +00:00
Dmitry Stogov
cea8df3af5
Fixed possible memory leak
2011-08-11 06:38:42 +00:00
