Ferenc Kovacs
200e407b24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:39:09 +02:00
Robin Gloster
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
Johannes Schlüter
16b4167fdd
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27 02:18:29 +02:00
Johannes Schlüter
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
Remi Collet
47bc380ecf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
2014-09-15 13:31:26 +02:00
Remi Collet
8cac75969e
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
...
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).
As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.
After applying this patch.
With mod_php
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foor/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
2014-09-15 13:29:55 +02:00
Bob Weinand
0cb365fb98
Merge phpdbg into PHP-5.6
2014-09-15 05:48:09 +02:00
Anatol Belski
bcdbd47117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed the cast and incompatible pointer warning
2014-09-12 14:36:54 +02:00
Anatol Belski
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
George Wang
4bdd9aabdd
Fine tuned the order of adding request variables.
2014-09-09 00:01:03 -04:00
George Wang
bdac08bcdd
Fine tuned the order of adding request variables.
2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10
Fine tuned the order of adding request variables.
2014-09-08 23:58:05 -04:00
George Wang
b85b78db4f
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:29:44 -04:00
George Wang
b16929ca72
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-09-03 11:28:30 -04:00
George Wang
bba16dde5d
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:27:54 -04:00
George Wang
582f42b8d4
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:24:45 -04:00
Stanislav Malyshev
e55c641792
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:11:55 -07:00
David Zuelke
ee275e34c8
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:06:00 -07:00
Remi Collet
e02616866f
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:38 +02:00
Remi Collet
e9166fec62
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:16 +02:00
David Zuelke
e6d93a11ad
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-09 08:26:33 +02:00
David Zuelke
d73d44c237
Revert "Merge branch 'pull-request/694' into PHP-5.6"
...
This reverts commit d96de86b5b
, reversing
changes made to b1e32a4f7a
.
2014-08-09 08:14:23 +02:00
Michael Wallner
ceadf783fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:13:39 +02:00
Michael Wallner
6ed9991a6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:50 +02:00
Michael Wallner
12b2127b72
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:13 +02:00
Xinchen Hui
235d0241d1
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-25 10:52:41 +08:00
Remi Collet
658f7d77f9
See bug #67635
...
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
2014-07-20 11:14:43 +02:00
Remi Collet
144a083954
improve previous, add message during configure
2014-07-19 18:42:40 +02:00
Remi Collet
7b60315672
Fixed bug #67635 php links to systemd libraries without using pkg-config
...
Patch from pacho at gentoo dot org
Rely on pkg-config for systemd >= 209
Failback on old check
2014-07-19 18:40:20 +02:00
Rasmus Lerdorf
3b08082600
This test depends on expose_php being on
2014-07-14 08:22:05 -07:00
Rasmus Lerdorf
935bc5795f
This test depends on expose_php being on
2014-07-14 08:21:57 -07:00
Tjerk Meesters
4e3d9a52ac
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 15:09:47 +08:00
Tjerk Meesters
1684ba3c6f
Fix #67594 - invisible colon should be stripped off header name
2014-07-12 12:45:50 +08:00
George Wang
ca8c94c917
fixed broken merged code
2014-07-11 14:57:55 -04:00
George Wang
84373a69dc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-07-11 14:40:54 -04:00
George Wang
79d8be35f9
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:38:18 -04:00
George Wang
9f721967a3
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:37:39 -04:00
George Wang
0baaf9fade
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:31:59 -04:00
Anatol Belski
fbc21af87b
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
sapi/litespeed/lsapilib.h
2014-07-10 22:15:52 +02:00
Anatol Belski
552cfcc578
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
2014-07-10 22:03:45 +02:00
George Wang
7f41a34c23
cleanup file headers.
2014-07-10 15:53:47 -04:00
George Wang
ad7eae7512
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:53:20 -04:00
George Wang
f0b7db6c4e
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:52:45 -04:00
George Wang
40d11cc822
cleanup file headers.
2014-07-10 15:34:09 -04:00
George Wang
caceba5973
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:33:48 -04:00
George Wang
ee0c8f8d6f
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:33:14 -04:00
George Wang
0285720570
Update LiteSpeed SAPI code to V6.4
...
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
2014-07-10 15:32:51 -04:00
George Wang
e7f36ba693
cleanup file headers.
2014-07-10 15:14:30 -04:00
George Wang
01a1c3067c
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:14:06 -04:00