summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Optimize zend_string_realloc() add more specialized versions zend_string_exte...Dmitry Stogov2015-03-201-2/+2
* fix conditionAnatol Belski2015-03-191-1/+1
* fix conditionAnatol Belski2015-03-191-2/+2
* use portable fseekAnatol Belski2015-03-111-1/+1
* Fixed phar test segfault after merged engine exceptionXinchen Hui2015-03-101-1/+3
* Revert "Add stream_socket_crypto_info() function"Daniel Lowrey2015-03-092-34/+1
* Fix CLI test and drop some now unnecessary codeNikita Popov2015-03-091-21/+2
* Implement engine exceptionsDmitry Stogov2015-03-091-0/+7
* Fixed buildWei Dai2015-03-091-1/+1
* Fix #67626Julien Pauli2015-03-081-2/+12
* ZTS cleanupReeze Xia2015-03-081-1/+1
* Merge branch 'PHP-5.6'Daniel Lowrey2015-03-051-4/+10
|\
| * Fixed bug (#69195 Inconsistent stream crypto values across versions)Daniel Lowrey2015-03-051-4/+10
* | Merge branch 'PHP-5.6'Daniel Lowrey2015-03-052-1/+4
|\ \ | |/
| * Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-052-4/+7
| * 5.6.8 up nextFerenc Kovacs2015-03-051-3/+3
* | Avoid repeatable strlen() callsDmitry Stogov2015-03-052-22/+22
* | Revive Zend Signals handler (and fixed bug #61083)Xinchen Hui2015-03-051-4/+0
* | Merge branch 'pull-request/1142'Reeze Xia2015-03-052-2/+2
|\ \
| * | Fixed wrong parameter type of php_stream_mmap_range()Reeze Xia2015-03-042-2/+2
* | | Merge branch 'tls-alpn'Daniel Lowrey2015-03-042-1/+34
|\ \ \
| * | | Add stream_socket_crypto_info() functionDaniel Lowrey2015-02-282-1/+34
* | | | Silence a empty while loop warningReeze Xia2015-03-041-1/+3
| |/ / |/| |
* | | Use zend_string* instead of char* for opened_patch handling. Avoid reallocati...Dmitry Stogov2015-03-0415-112/+113
* | | 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
| * | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
* | | Cleanup globals initializationXinchen Hui2015-02-211-39/+13
* | | this line got accitentally dropped on mergeMichael Wallner2015-02-191-0/+1
* | | Merge branch 'PHP-5.6'Michael Wallner2015-02-181-10/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2015-02-181-11/+12
| |\ \ | | |/
| | * Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)Michael Wallner2015-02-181-11/+12
| * | 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
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-051-7/+2
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-051-7/+2
| | |\
| | | * Update header handling to RFC 7230Stanislav Malyshev2015-02-051-7/+2
| * | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-051-0/+4
| |\ \ \ | | |/ /
| | * | Conflicts:Nayana Hettiarachchi2015-02-051-0/+4
View Lorry Controller Status