summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into phpngDmitry Stogov2014-07-221-0/+1
|\
| * Merge branch 'PHP-5.6'Anatol Belski2014-07-211-0/+1
| |\
| | * force atoll macro usage on windowsAnatol Belski2014-07-211-0/+1
* | | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-0/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6'Lior Kaplan2014-07-171-0/+4
| |\ \ | | |/
| | * Enable build without atoll (e.g old AIX flavours)Lior Kaplan2014-07-171-0/+4
* | | Changed zend_make_printable_zval() to return "use_copy" instead of additional...Dmitry Stogov2014-07-092-2/+2
* | | Merge branch 'master' into testDmitry Stogov2014-07-074-24/+34
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6'Michael Wallner2014-07-034-25/+34
| |\ \ | | |/
| | * restore API compatibilityMichael Wallner2014-07-034-4/+17
| | * finishMichael Wallner2014-07-035-12/+5
| | * refactor php_stream_temp_create{,_ex} and use it for the php://input streamMichael Wallner2014-07-032-5/+14
| | * refactor _php_stream_fopen_{temporary_,tmp}file()Michael Wallner2014-07-031-20/+14
| | * fix length overflow of HTTP_RAW_POST_DATAMichael Wallner2014-07-031-0/+6
* | | Merge branch 'call-frame' into phpngDmitry Stogov2014-07-073-21/+24
|\ \ \
| * | | Simplify call-frame handlingDmitry Stogov2014-07-071-0/+2
| * | | Removed EG(active_symbol_table) and use corresponding value from EG(current_e...Dmitry Stogov2014-07-042-13/+15
| * | | Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are e...Dmitry Stogov2014-07-031-5/+5
| * | | Removed EG(opline_ptr) and use corresponding value from EG(current_execute_data)Dmitry Stogov2014-07-021-2/+1
| * | | Removed EG(active_op_array) and use corresponding value from EG(current_execu...Dmitry Stogov2014-07-021-1/+1
* | | | Fixed segfault if empty POSTXinchen Hui2014-07-031-4/+2
|/ / /
* | | Hide warning message after fatal errorsDmitry Stogov2014-06-201-9/+11
* | | Check if socket is still aliveDmitry Stogov2014-06-201-3/+15
* | | Merge branch 'master' into phpngDmitry Stogov2014-06-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6'Adam Harvey2014-06-121-1/+1
| |\ \ | | |/
| | * Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-06-121-1/+1
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-121-1/+1
| | | |\
| | | | * Keep 308-399 HTTP response codes when header('Location:') is called.Adam Harvey2014-06-121-1/+1
| | | | * 5.4.31 nextStanislav Malyshev2014-06-101-3/+3
| | | | * 5.4.30 nextStanislav Malyshev2014-05-131-3/+4
| | | * | 5.5.15 nowJulien Pauli2014-06-111-3/+3
| | | * | 5.5.14 nowJulien Pauli2014-05-141-3/+3
| | * | | fix bug #67198 (php://input regression)Michael Wallner2014-05-061-1/+1
* | | | | Don't use cast (compiler friendly)Xinchen Hui2014-05-261-2/+2
* | | | | Fixed segafult while stream is referenced by persistent resource (like dba)Xinchen Hui2014-05-211-1/+1
* | | | | Fixed resources apply_dtorXinchen Hui2014-05-191-1/+2
* | | | | Fixed uninitialized usedXinchen Hui2014-05-181-1/+1
* | | | | Fixed wrong comparisonsDmitry Stogov2014-05-151-3/+3
* | | | | forgot that hash uses ending 0Pierre Joye2014-05-151-2/+2
* | | | | zend_hash_del>zend_hash_str_delPierre Joye2014-05-151-2/+2
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-05-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | fix bug #67198 (php://input regression)Michael Wallner2014-05-061-1/+1
* | | | | Test push (previous push didn't send mail?)Xinchen Hui2014-05-101-0/+1
* | | | | Added smart_string to avoid string duplicatedXinchen Hui2014-05-101-53/+54
* | | | | Added vstrpprintf strpprintf to avoid duplicate stringXinchen Hui2014-05-103-1/+33
* | | | | There should been memory leaks(and don't use pointer cast)Xinchen Hui2014-05-081-2/+2
* | | | | Prefer the macro we definedXinchen Hui2014-05-071-11/+7
* | | | | Refactored filterXinchen Hui2014-05-071-4/+5
* | | | | Merge branch 'phpng' of git.php.net:php-src into phpngXinchen Hui2014-05-071-0/+1
|\ \ \ \ \
| * | | | | -- missing length declaration, may have worked w/some gcc as length is not us...Pierre Joye2014-05-071-0/+1