1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

550 Commits

Author SHA1 Message Date
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
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
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
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
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
Xinchen Hui 18cf4e0a8a Fixed fpm-side (tests passes) 2015-05-23 19:01:41 +08:00
Xinchen Hui ba5ecf355f Use logger pointer 2015-05-19 16:34:08 +08:00
Kalle Sommer Nielsen 8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Anatol Belski af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Anatol Belski 12a42433b2 remove useless condition 2015-02-11 11:46:29 +01:00
Anatol Belski 563e7822fd fix datatype mismatches, improve error checks 2015-01-30 16:31:19 +01:00
Xinchen Hui 9fdf62d64a Merge branch 'PHP-5.6'
Conflicts:
	sapi/cgi/cgi_main.c
2015-01-27 22:15:12 +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 fc33f52d8c bump year 2015-01-15 23:27:30 +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
Xinchen Hui 2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Stanislav Malyshev 16b904cc1c Merge branch 'PHP-5.6'
* PHP-5.6:
  FIx bug #68618 (out of bounds read crashes php-cgi)
  Fixed bug #68676 (Explicit Double Free)
  Fixed bug #68676 (Explicit Double Free)
2014-12-30 01:27:20 -08: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
Andrea Faulds e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski 88bb9fedc4 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (111 commits)
  Fix zend_fcall_info_arg*() to use ZVAL_COPY
  Fixed #65213 - cannot cast SplFileInfo to boolean
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
  fix TS build
  add config option to target codegen architectures
  updated NEWS
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation
  Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
  Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
  Fixed __debugInfo() support
  Update UPGRADING for the new variadic functions, and re-sort.
  Improved POST INC/DEC
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
  Missed closed folder mark
  Revert "Unecessary assignment"
  Fixed improper memory release
  Unecessary assignment
  ...
2014-12-05 03:50:02 +01:00
Anatol Belski 8ced6f1167 fix datatype mismatches and warnings 2014-12-02 11:24:21 +01:00
Anatol Belski b35555f6cd fix datatype mismatches 2014-12-02 09:15:11 +01:00
Anatol Belski 1bcc7d919c fix datatype mismatches 2014-12-02 09:15:10 +01:00
Anatol Belski 4cba2f9811 fix datatype mismatch 2014-12-02 09:15:09 +01:00