summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* bump versionJoe Watkins2016-06-071-2/+2
* fix typoAnatol Belski2016-06-021-1/+1
* Added backwards compability with php_log_err by using macroJani Ollikainen2016-06-022-4/+5
* Logging to syslog with dynamic error levels (related to #49467)Jani Ollikainen2016-06-022-4/+12
* Merge branch 'PHP-7.0'Xinchen Hui2016-06-021-1/+6
|\
| * Fixed bug #72308 (fastcgi_finish_request and logging environment variables)Xinchen Hui2016-06-021-1/+6
* | Merge branch 'PHP-7.0'Joe Watkins2016-05-291-0/+2
|\ \ | |/
| * This is exported at implementation site, but no forward declaration can cause...Joe Watkins2016-05-291-0/+2
* | Merge branch 'PHP-7.0'Xinchen Hui2016-05-161-1/+1
|\ \ | |/
| * Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)Xinchen Hui2016-05-161-1/+1
| * prepare next 7.0.8Anatol Belski2016-05-101-3/+3
* | Implement #51879 stream context socket option tcp_nodelayJoe Watkins2016-04-293-27/+62
* | Merge branch 'PHP-7.0'Joe Watkins2016-04-281-1/+1
|\ \ | |/
| * simplify expressionJoe Watkins2016-04-281-1/+1
* | Merge branch 'PHP-7.0'Joe Watkins2016-04-281-1/+1
|\ \ | |/
| * simplify expressionJoe Watkins2016-04-281-1/+1
* | - get rid of EG(scope). zend_get_executed_scope() should be used instead.Dmitry Stogov2016-04-281-1/+1
* | Removed "zend_fcall_info.function_table". It was assigned in many places, but...Dmitry Stogov2016-04-271-1/+0
* | Merge branch 'PHP-7.0'Anatol Belski2016-04-231-0/+7
|\ \ | |/
| * Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive rootAnatol Belski2016-04-231-0/+7
| * prepare nextAnatol Belski2016-04-121-3/+3
* | Safe execution timeout handling.Dmitry Stogov2016-04-202-4/+1
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-311-6/+1
|\ \ | |/
| * remove unused params || woopsJoe Watkins2016-03-311-6/+1
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-313-3/+99
|\ \ | |/
| * fix #71609: Segmentation fault on ZTS with gethostbynameJoe Watkins2016-03-313-3/+99
* | Merge branch 'PHP-7.0'Joe Watkins2016-03-271-9/+18
|\ \ | |/
| * fix #70189 (SAPI sends empty Content-Type when default_mimetype is empty)Joe Watkins2016-03-271-9/+18
* | Merge branch 'PHP-7.0'Xinchen Hui2016-03-251-10/+17
|\ \ | |/
| * Fixed bug #71891 (header_register_callback() and register_shutdown_function())Xinchen Hui2016-03-251-10/+17
| * prepare nextAnatol Belski2016-03-151-3/+3
* | Merge branch 'PHP-7.0'Nikita Popov2016-03-031-6/+0
|\ \ | |/
| * Eliminate usages of _PP macrosNikita Popov2016-03-031-6/+0
* | Merge branch 'PHP-7.0'Nikita Popov2016-03-031-1/+1
|\ \ | |/
| * Fix bug #71575 removing extra semicolons outside macrosJames Titcumb2016-03-031-1/+1
* | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
* | Merge branch 'PHP-7.0'Stanislav Malyshev2016-02-211-2/+2
|\ \ | |/
| * Fix bug #71629: sync php_url_decode definitionStanislav Malyshev2016-02-211-2/+2
* | Merge branch 'PHP-7.0'Anatol Belski2016-02-181-0/+3
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-181-0/+3
| |\
| | * Bug #71596 Segmentation fault on ZTS with date function (setlocale)Anatol Belski2016-02-181-0/+3
| | * 5.6.20 is nextFerenc Kovacs2016-02-181-3/+3
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-02-171-2/+2
|\ \ \ | |/ /
| * | Remove TSRMLS_* from code, they are not used anymoreStanislav Malyshev2016-02-171-2/+2
| * | prepare nextAnatol Belski2016-02-161-3/+3
* | | Merge branch 'PHP-7.0'Nikita Popov2016-02-142-17/+3
|\ \ \ | |/ /
| * | Fix format attributes in ZTSNikita Popov2016-02-142-17/+3
| * | fix version headerAnatol Belski2016-02-111-3/+3
| * | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2016-02-051-3/+3
| |\ \ | | |/
| | * Merge branch 'PHP-5.6.18' into PHP-5.6Stanislav Malyshev2016-02-011-14/+16
| | |\