Reeze Xia
4e2c87edb3
Fixed bug #67741 (auto_prepend_file messes up __LINE__)
...
This also fixes bug #54081
2015-03-03 11:43:23 +08:00
George Wang
65810bf259
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
2015-02-25 11:24:19 -05:00
Antony Dovgal
c4664d1731
Merge branch 'pull-request/995' into PHP-5.6
...
* pull-request/995:
fix bug #68822 (request time is reset too early)
2015-02-16 15:15:11 +03:00
redfoxli
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
George Wang
c90cd09331
Fixed #68790 (Missing return)
2015-02-07 12:19:53 -05:00
Stanislav Malyshev
ac3a4e4200
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:21 -08:00
Frank Stolle
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
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
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
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
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
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Xinchen Hui
b881de9937
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
Xinchen Hui
92d56b0af6
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
Xinchen Hui
6336fa18c4
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
Rasmus Lerdorf
e242f871df
Slightly modify and merge PR#105 from @MegaManSec
2015-01-21 11:40:27 -08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Rasmus Lerdorf
5065505c93
Fix bug #68784
2015-01-09 18:09:13 -08:00
Rasmus Lerdorf
e4b3d623a2
Fix bug #68784
2015-01-09 18:08:36 -08:00
Remi Collet
0ba32e5cf9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cleanup old unused typedef
2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a
cleanup old unused typedef
2015-01-06 11:06:25 +01:00
Adam Harvey
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
2015-01-06 01:27:37 +00:00
Adam Harvey
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
Adam Harvey
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
Remi Collet
eb1a1d5feb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:35:14 +01:00
Remi Collet
1b6d076244
Fix bug #68751 listen.allowed_clients is broken
2015-01-05 17:33:57 +01:00
Stanislav Malyshev
4c0f17caca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
2014-12-30 01:26:53 -08:00
Stanislav Malyshev
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
Stanislav Malyshev
f9ad308669
FIx bug #68618 (out of bounds read crashes php-cgi)
2014-12-30 01:23:05 -08:00
Remi Collet
505adabf25
fix typo
2014-12-14 09:22:59 +01:00
redfoxli
7953d830ab
follow C89 format
2014-12-10 21:58:57 +08:00
Remi Collet
744ada7d9d
Fix bug #68526 Implement POSIX Access Control List for UDS
...
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option
Keep old behavior (chmod) if option not used or not supported.
2014-12-10 08:15:21 +01:00
redfoxli
d0a58695d0
fix-bug-68571-to-php5.5
2014-12-09 19:42:55 +08:00
Anatol Belski
f33bd9c846
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible null pointer math
2014-12-01 14:43:22 +01:00
Anatol Belski
cb6dea6ea8
fix possible null pointer math
2014-12-01 14:40:35 +01:00
nil0x42
2a73d56ef9
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:42:12 -08:00
nil0x42
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
Remi Collet
cb1a297bf4
XFAIL as catch_workers_output = yes seems not reliable
2014-12-01 07:28:49 +01:00
Remi Collet
e1d4ac426c
Move chown to fpm_unix_set_socket_premissions()
...
For consistency, with fpm_unix_resolve_socket_premissions.
Compute + Use in the same source file.
To make easier future enhancement.
Also check chdir output to fix a build warning.
2014-11-29 16:49:08 +01:00
Ferenc Kovacs
7e4b77c921
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test with readline on mac
2014-11-29 01:49:23 +01:00
Ferenc Kovacs
108bf84967
fix test with readline on mac
2014-11-29 01:47:45 +01:00
Ferenc Kovacs
aef51819ce
typo fix
2014-11-26 18:41:50 +01:00
Ferenc Kovacs
0afc04b913
go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol)
2014-11-26 18:38:36 +01:00