f13a88ac13
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:23:36 -05:00
1d94cd4bfa
Merge branch 'pull-request/995' into PHP-5.5
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:20:39 +03:00
3664345aba
fix bug #68822 (request time is reset too early)
...
this caused wrong time in the logs
2015-02-16 15:10:09 +03:00
fc444fbc70
Shut up, my lovely compiler; I do not like your warnings
...
Conflicts:
Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
c892127f76
Fixed #68790 (Missing return)
2015-02-07 12:18:42 -05:00
6a905a9a3c
Fix #66479 : Wrong response to FCGI_GET_VALUES
...
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
Conflicts:
sapi/cgi/fastcgi.c
2015-02-01 00:35:23 -08:00
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
e4b3d623a2
Fix bug #68784
2015-01-09 18:08:36 -08:00
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
448ef30f75
Handle NULL strings in sapi_cli_server_register_variable().
...
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
2015-01-06 01:23:27 +00:00
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
2015-01-06 01:22:59 +00:00
1b6d076244
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:33:57 +01:00
71c970077d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:26:00 -08:00
f9ad308669
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:23:05 -08:00
7953d830ab
follow C89 format
2014-12-10 21:58:57 +08:00
d0a58695d0
fix-bug-68571-to-php5.5
2014-12-09 19:42:55 +08:00
cb6dea6ea8
fix possible null pointer math
2014-12-01 14:40:35 +01:00
a87300241f
Fix php cli (-S option) inconsistent port parsing
...
Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).
2014-11-30 22:29:24 -08:00
108bf84967
fix test with readline on mac
2014-11-29 01:47:45 +01:00
c50ee655ea
Fixed Bug #68478 acess_log don't use prefix
...
Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log
2014-11-22 10:35:51 +01:00
96cde1841a
Revert "made lsapi_main.c compatible with PHP7/phpng ."
...
This reverts commit 9fb816f45a
2014-11-22 00:38:04 -08:00
5be75da202
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
...
Add a "There are no allowed addresses for this pool"
2014-11-21 07:55:13 +01:00
c4ca220467
Raise a warning when listen = hostname used and is resolved as multiple addresses
...
Using getaddrinfo is perhaps not a good idea... if we are not able
to listen on multiple addresses...
At least this message should help to diagnose problem, ex
... Found address for localhost, socket opened on ::1
... Found multiple addresses for localhost, 127.0.0.1 ignored
2014-11-21 07:54:51 +01:00
9e8d4a1b06
move zlog_set_level() again
...
from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894 ),
because otherwise nothing in fpm_conf_init_main() obeys log levels
2014-11-21 07:49:08 +01:00
8beb153460
Change pm.start_servers default warning to notice
...
Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
2014-11-21 07:47:04 +01:00
29d2c13809
Fixed bug #68391 Returns the pool config files in order
...
Fixes https://bugs.php.net/bug.php?id=68391
2014-11-21 07:33:15 +01:00
d467761663
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-11-20 16:56:03 -05:00
bd3bc097b0
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:49:56 -05:00
9fb816f45a
made lsapi_main.c compatible with PHP7/phpng .
2014-11-20 16:49:01 -05:00
858c9d86fa
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
2014-11-19 16:46:51 +01:00
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
09f9f7ce50
update fpm configuration for #68428
2014-11-17 09:43:09 +01:00
3a8103ae47
Fixed bug #68428 allowed_client is IPv4 only
2014-11-17 09:22:13 +01:00
4475cbdc85
comment about ipv4-mapped in fpm conf
2014-11-17 06:57:59 +01:00
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
23fd22f9ed
improve comments about FPM listen option
2014-11-16 17:59:36 +01:00
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
5112fdd670
Fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-14 19:09:50 +01:00
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
19f3f4b155
set default response code to 200
2014-11-03 11:42:45 -05:00
1a2ec3fc60
set default response code to 200
2014-11-03 11:42:01 -05:00
George Wang