Commit Graph

768 Commits

Author SHA1 Message Date
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
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
Dmitry Stogov
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
Anatol Belski
269acaa363 Merge branch 'pull-request/1284'
* pull-request/1284:
  Rename interface macros
  Fix typo in UPGRADING
  Move definition of Throwable to zend_exceptions.h/c
  Check for zend_ce_throwable instead
  Fix some missed tests
  Add Throwable tests
  Fix previous exception type check
  Updated UPGRADING with RFC link
  Changed AssertionException to AssertionError
  Update exception error messages
  Throwable method signatures.
  Update exception names in tests after formatting changes.
  Merge exception formatting changes.
  Make zend_get_exception_base static.
  Fix a few missed tests.
  Fix handler double copy.
  Updated tests to reflect exception class changes.
  Remodel exceptions based on Throwable interface
2015-06-17 21:55:03 +02:00
Kalle Sommer Nielsen
4445268281 Fixed bug #69849 (Broken output of apache_request_headers) 2015-06-16 16:11:21 +02:00
Kalle Sommer Nielsen
ab4aae5fd7 Use zend_parse_parameters_none() here 2015-06-16 15:15:27 +02:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
Anatol Belski
6d582c6a24 added the shared fcgi imp to sapi/cgi
This is yet a workaround, if another part of the source would need
the same object file, it'll end up producing duplicated nmake target.
Some additional implementation is needed so same object files can be
shared between different modules, to handle this situation better.
2015-05-26 09:44:41 +02:00
Xinchen Hui
9f1788f00d Only link fastcgi into fpm and cgi 2015-05-26 13:55:39 +08:00
Xinchen Hui
5f753f9e2e Micro optimizations 2015-05-26 11:47:01 +08:00
Xinchen Hui
f20118aa66 Avoid multipy allocating of request env 2015-05-24 01:07:36 +08:00
Xinchen Hui
86de98caba Use weak function for fcgi_log 2015-05-23 19:19:48 +08:00