902d39a3a7
Trim trailing whitespace in source code files
2018-10-13 14:14:50 +02:00
879c937a27
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #76954 : apache_response_headers removes last character from header name
2018-10-08 12:30:45 +02:00
47b89bc531
Fix #76954 : apache_response_headers removes last character from header name
2018-10-08 12:29:31 +02:00
b8cfa09657
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Avoid code duplication and don't miss env restore
2018-10-03 14:34:08 +02:00
044eb39e63
Avoid code duplication and don't miss env restore
2018-10-03 14:32:52 +02:00
dc48e01a19
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:13:22 +02:00
b0547a3dfb
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:11:43 +02:00
1350f4f997
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix invalid free
2018-01-13 12:33:02 +01:00
2503a27ae0
Fix invalid free
2018-01-13 12:32:22 +01:00
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
0b30461764
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Follow up on bug #75574 for FCGI side
2017-11-28 20:34:44 +01:00
8b57a5bca0
Follow up on bug #75574 for FCGI side
2017-11-28 20:33:11 +01:00
fc1ae1d1d3
Exclude warm-up requests from callgrind profile.
2017-05-31 16:16:56 +03:00
bdfe07c2e7
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
2017-01-12 22:08:20 +01:00
aacba43056
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
2017-01-12 22:06:03 +01:00
e65760f878
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 17:25:26 +01:00
9f3b3a55fe
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 14:15:21 +01:00
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
8efbcf18a1
Remove this old obsolete code
2016-11-21 15:18:55 +01:00
3ed8b7a87b
Use "Standard input code" instead of "php://stdin"
2016-11-12 17:26:20 +00:00
a103aa2dbd
Show "php://stdin" instead of "-" in error messages
2016-11-12 17:26:20 +00:00
2809a676b5
Pass error severity to SAPI modules and raise corresponding error level in Apache
2016-07-11 09:34:48 +02:00
0cfb47651c
Fixed compilation warnings
2016-06-28 11:37:51 +03:00
22ecd4428a
Fixed compilation warnings
2016-06-21 17:56:07 +03:00
7cc1b00163
Improved support for zend-signals.
2016-06-20 22:41:14 +03:00
c8706331b5
Cleanup zend_signal API
2016-06-20 14:58:42 +03:00
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
85ade00465
fix callback signature compat
2016-02-23 18:18:34 +01:00
60d98605ca
reorder comments
2016-01-19 09:04:52 +01:00
03263fded1
get rid of win32_ prefix
2016-01-19 09:02:12 +01:00
fb1f4769b9
check return values and cleanup the job object on exit
2016-01-19 08:57:58 +01:00
8e60e0c927
trap also children exits on shutdown to avoid unhandled exceptions
2016-01-18 20:52:17 +01:00
092a87c9d8
implement FCGI children automatic restart and cleanup
2016-01-13 21:32:38 +01:00
5b91658365
Basic implementation for FCGI to respect PHP_FCGI_CHILDREN on Windows
...
PHP_FCGI_CHILDREN number of children processes will be spawned, sharing
same TCP socket. To implement yet
- children cleanup on exit
- automatic children re-spawning
2016-01-13 21:32:36 +01:00
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
ea12ff149c
Added support for HTTP 451
2015-12-23 11:31:18 +01:00
269674f79d
rm duplicate include
2015-11-07 23:01:23 -08:00
22af88274b
Fix globals initialization in sapi/cgi
...
Basically backport 8430ec17
2015-10-23 13:56:40 +02:00
01ed736827
Don't keep dangling pointers
2015-09-23 16:16:04 +03:00
85a511d2c1
fix zend signal and tsrm compat
2015-09-01 09:34:54 +01:00
3d7343f609
integrate the applink shim in the other bins
2015-07-03 07:11:14 +02:00
a1cf46bb1f
remove useless assignment
2015-06-29 07:33:20 +02:00
8430ec1788
fix FCGI crash in TS mode
...
If CGI TS build is used, and there are some hard errors (fe missing
dependency .dll or .so), the core will want to log it. The CGI
log function will want to check whether fcgi_logging is enabled. But,
if this kind of error happens in the extension register phase,
MINIT for the CGI module is most likely wasn't run yet (startup phase).
That will result in accessing uninitialized globals and a crash.
2015-06-29 07:33:19 +02:00
f0d2a0e542
Encapsulate FastCGI implementation details.
...
Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
2015-06-23 16:27:21 +03:00
4445268281
Fixed bug #69849 (Broken output of apache_request_headers)
2015-06-16 16:11:21 +02:00
ab4aae5fd7
Use zend_parse_parameters_none() here
2015-06-16 15:15:27 +02:00
Peter Kokot