George Wang
d467761663
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-11-20 16:56:03 -05:00
George Wang
bd3bc097b0
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:49:56 -05:00
Remi Collet
858c9d86fa
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
2014-11-19 16:46:51 +01:00
David Zuelke
03cf70ab1e
Fixed bug #68381 Set FPM log level earlier during init
...
The log level will be ignored throughout log events in fpm_unix_init_main, until
the very end when zlog_set_level is finally called.
In particular, fpm_unix_conf_wp may throw notices like this:
> [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when…
Which will still appear even if log_level in php-fpm.conf is set to warning+
2014-11-18 17:42:21 +01:00
Remi Collet
09f9f7ce50
update fpm configuration for #68428
2014-11-17 09:43:09 +01:00
Remi Collet
3a8103ae47
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:22:13 +01:00
Remi Collet
4475cbdc85
comment about ipv4-mapped in fpm conf
2014-11-17 06:57:59 +01:00
Remi Collet
4657289e87
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
...
Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)
2014-11-17 06:53:38 +01:00
Remi Collet
23fd22f9ed
improve comments about FPM listen option
2014-11-16 17:59:36 +01:00
Remi Collet
1d9bb287c5
Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
...
Restore default behavior when no address configured:
Listen on all IPv4 addresses.
At some time we could consider to switch to all IPv6
but this will be a BC break.
2014-11-15 08:08:23 +01:00
Remi Collet
5112fdd670
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:09:50 +01:00
Remi Collet
23db119768
Fix bug #68423i PHP-FPM will no longer load all pools
...
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
2014-11-14 17:29:31 +01:00
George Wang
19f3f4b155
set default response code to 200
2014-11-03 11:42:45 -05:00
George Wang
ef0eed7f5f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-10-03 16:43:08 -04:00
George Wang
0cc2600ec6
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:15 -04:00
Robin Gloster
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +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
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
Anatol Belski
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02: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
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
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
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
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
Tjerk Meesters
1684ba3c6f
Fix #67594 - invisible colon should be stripped off header name
2014-07-12 12:45:50 +08: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
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
George Wang
1f46bec9ce
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 14:46:43 -04:00
George Wang
e3df0c5f60
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
2014-07-10 14:42:05 -04:00
George Wang
eb7bf5d30a
Fixed typo in Makefile.frag
2014-07-10 12:22:56 -04:00
George Wang
a34288fa1a
Fixed typo in Makefile.frag
2014-07-10 12:21:23 -04:00
Remi Collet
0c840ced7c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix Bug #67530 error_log=syslog ignored
2014-07-08 08:30:44 +02:00
Remi Collet
f8acf826c3
Fix Bug #67530 error_log=syslog ignored
...
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-07-08 08:29:24 +02:00
Adam Harvey
1939b34c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:40:47 +00:00