Anatol Belski
1350f4f997
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix invalid free
2018-01-13 12:33:02 +01:00
Anatol Belski
2503a27ae0
Fix invalid free
2018-01-13 12:32:22 +01:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Anatol Belski
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
Anatol Belski
8b57a5bca0
Follow up on bug #75574 for FCGI side
2017-11-28 20:33:11 +01:00
Joe Watkins
b0950ff854
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:46 +01:00
Joe Watkins
1981c48e60
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:34 +01:00
Peter Kokot
29e673f8ed
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:09 +01:00
Dmitry Stogov
fc1ae1d1d3
Exclude warm-up requests from callgrind profile.
2017-05-31 16:16:56 +03:00
Anatol Belski
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
Anatol Belski
aacba43056
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
2017-01-12 22:06:03 +01:00
Anatol Belski
e65760f878
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 17:25:26 +01:00
Anatol Belski
9f3b3a55fe
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 14:15:21 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Nikita Popov
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
Kalle Sommer Nielsen
8efbcf18a1
Remove this old obsolete code
2016-11-21 15:18:55 +01:00
Andrea Faulds
3ed8b7a87b
Use "Standard input code" instead of "php://stdin"
2016-11-12 17:26:20 +00:00
Andrea Faulds
a103aa2dbd
Show "php://stdin" instead of "-" in error messages
2016-11-12 17:26:20 +00:00
Martin Vobruba
2809a676b5
Pass error severity to SAPI modules and raise corresponding error level in Apache
2016-07-11 09:34:48 +02:00
Dmitry Stogov
0cfb47651c
Fixed compilation warnings
2016-06-28 11:37:51 +03:00
Dmitry Stogov
22ecd4428a
Fixed compilation warnings
2016-06-21 17:56:07 +03:00
Dmitry Stogov
7cc1b00163
Improved support for zend-signals.
2016-06-20 22:41:14 +03:00
Dmitry Stogov
c8706331b5
Cleanup zend_signal API
2016-06-20 14:58:42 +03:00
Nikita Popov
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
Anatol Belski
85ade00465
fix callback signature compat
2016-02-23 18:18:34 +01:00
Anatol Belski
60d98605ca
reorder comments
2016-01-19 09:04:52 +01:00
Anatol Belski
03263fded1
get rid of win32_ prefix
2016-01-19 09:02:12 +01:00
Anatol Belski
fb1f4769b9
check return values and cleanup the job object on exit
2016-01-19 08:57:58 +01:00
Anatol Belski
8e60e0c927
trap also children exits on shutdown to avoid unhandled exceptions
2016-01-18 20:52:17 +01:00
Anatol Belski
092a87c9d8
implement FCGI children automatic restart and cleanup
2016-01-13 21:32:38 +01:00
Anatol Belski
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
Lior Kaplan
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
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Julien Pauli
ea12ff149c
Added support for HTTP 451
2015-12-23 11:31:18 +01:00
Lior Kaplan
9642710a09
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Conflicts:
sapi/cgi/config9.m4
sapi/fpm/config.m4
2015-11-23 18:56:13 +02:00
Lior Kaplan
d6b78a3511
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
2015-11-23 18:40:47 +02:00
Lynn
269674f79d
rm duplicate include
2015-11-07 23:01:23 -08:00
Anatol Belski
22af88274b
Fix globals initialization in sapi/cgi
...
Basically backport 8430ec17
2015-10-23 13:56:40 +02:00
Anatol Belski
59541795e2
fork test
2015-09-30 11:13:29 +02:00
Anatol Belski
e80306cbe8
fix tests on Windows
2015-09-30 11:13:28 +02:00
Anatol Belski
353d996c9f
tweak cgi binary search
2015-09-30 11:13:27 +02:00
Dmitry Stogov
01ed736827
Don't keep dangling pointers
2015-09-23 16:16:04 +03:00
Joe Watkins
85a511d2c1
fix zend signal and tsrm compat
2015-09-01 09:34:54 +01:00
Anatol Belski
3d7343f609
integrate the applink shim in the other bins
2015-07-03 07:11:14 +02:00
Anatol Belski
a1cf46bb1f
remove useless assignment
2015-06-29 07:33:20 +02:00
Anatol Belski
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
