summaryrefslogtreecommitdiff
path: root/main/main.c
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug #71891 (header_register_callback() and register_shutdown_function())Xinchen Hui2016-03-251-10/+17
* 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
| * backport 9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0Anatol Belski2016-01-111-3/+16
* | improve fix for bug #71273Anatol Belski2016-01-051-1/+1
* | Fixed bug #71273 A wrong ext directory setup in php.ini leads to crashAnatol Belski2016-01-051-3/+16
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ | |/
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| * Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-05-121-2/+2
| |\
| | * Fix for #66048Julien Pauli2015-05-121-2/+2
* | | Removed signal protection (set to NULL before free() to avoid dangling pointers)Dmitry Stogov2015-08-281-8/+4
* | | Mark error functions as "cold"Dmitry Stogov2015-08-241-8/+8
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without s...Dmitry Stogov2015-06-301-19/+19
* | | further cleanups with S_IF* macros generalized declarationsAnatol Belski2015-05-251-4/+0
* | | Partial revert of 6a819bba40661a9a8d7080994cb2f24b73c5d46c.Dmitry Stogov2015-05-131-6/+6
* | | Fix for #66048Julien Pauli2015-05-121-14/+25
* | | Fix buildKalle Sommer Nielsen2015-04-041-1/+1
* | | This part here was moved to the EG constructor by Anatol in f51a9c71dd011f7d6...Kalle Sommer Nielsen2015-04-041-14/+1
* | | Remove the special disabled functions on Windows, since we don't even support...Kalle Sommer Nielsen2015-03-291-37/+0
* | | Drop this VC8+ check, since our bare minimum of required VC version is higher...Kalle Sommer Nielsen2015-03-291-4/+3
* | | Drop zend_indent() as it was never used, complete or workingKalle Sommer Nielsen2015-03-271-11/+0
* | | Fixed phar test segfault after merged engine exceptionXinchen Hui2015-03-101-1/+3
* | | Fix CLI test and drop some now unnecessary codeNikita Popov2015-03-091-21/+2
* | | Implement engine exceptionsDmitry Stogov2015-03-091-0/+7
* | | Use zend_string* instead of char* for opened_patch handling. Avoid reallocati...Dmitry Stogov2015-03-041-7/+4
* | | Merge branch 'PHP-5.6'Reeze Xia2015-03-031-10/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Reeze Xia2015-03-031-10/+12
| |\ \ | | |/
| | * Improve fix for bug 67741Reeze Xia2015-03-031-10/+12
| | * Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
* | | Merge branch 'PHP-5.6'Reeze Xia2015-03-031-1/+14
|\ \ \ | |/ /
| * | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-271-2/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-2/+1
| |\ \ | | |/
| | * ReorderXinchen Hui2015-02-271-2/+1
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-271-0/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-0/+5
| |\ \ | | |/
| | * Fixed bug #69121 (Segfault in get_current_user when script owner is not in pa...Xinchen Hui2015-02-271-0/+5
| | * Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
| | * Bump yearXinchen Hui2015-01-151-1/+1
| * | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
| * | Fix another invalid free of CG(interned_empty_string)manuel2015-02-071-1/+1
| * | Invalid free of CG(interned_empty_string)manuel2015-02-061-1/+1
* | | Cleanup globals initializationXinchen Hui2015-02-211-39/+13
* | | Merged zend_array and HashTable into the single data structure.Dmitry Stogov2015-02-131-2/+2
* | | Revert "Cleanup globals initialization"Xinchen Hui2015-02-131-19/+42
* | | Cleanup globals initializationXinchen Hui2015-02-131-42/+19
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-031-1/+1
|\ \ \ | |/ /
| * | Fixed indentXinchen Hui2015-02-031-1/+1
* | | Merge branch 'PHP-5.6'Yasuo Ohgaki2015-02-031-7/+1
|\ \ \ | |/ /
| * | Fixed Bug #67988 htmlspecialchars() does not respect default_charset specifie...Yasuo Ohgaki2015-02-031-7/+1