summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Refactor fileinfoXinchen Hui2014-05-071-3/+8
|/ /
* | Make they are in the same style of Z_ISREFXinchen Hui2014-05-031-20/+20
* | zend_stack_top() now returns pointer directlyNikita Popov2014-05-011-3/+3
* | Don't allocate zend_stack elements individuallyNikita Popov2014-05-011-9/+7
* | Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-302-18/+18
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-2614-95/+197
|\ \ | |/
| * Merge branch 'PHP-5.6'Anatol Belski2014-04-242-2/+2
| |\
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-242-2/+2
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-242-2/+2
| | | |\
| | | | * fix dll exportAnatol Belski2014-04-242-2/+2
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-202-22/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-202-22/+27
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-202-22/+27
| | | |\ \ | | | | |/
| | | | * Fix bug #65701: Do not use cache for file file copyBoro Sitnikovski2014-04-202-22/+27
| | | | * 5.4.29 is nextStanislav Malyshev2014-04-151-3/+3
| | | * | 5.5.12RC1 setupJulien Pauli2014-04-151-3/+3
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-04-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-04-131-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-04-131-1/+1
| | | |\ \ | | | | |/
| | | | * fix typoFerenc Kovacs2014-04-131-1/+1
| * | | | Merge branch 'PHP-5.6'Bob Weinand2014-04-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Bob Weinand2014-04-121-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-121-1/+1
| | | |\ \ | | | | |/
| | | | * Made usage of php_hash_environment useful by updating instead of just adding ...Bob Weinand2014-04-121-1/+1
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-04-032-2/+21
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-032-2/+21
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-032-2/+21
| | | |\ \ | | | | |/
| | | | * Fix Bug #66736 fpassthru brokenMichael Wallner2014-04-032-2/+21
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-04-021-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-021-0/+4
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-021-0/+4
| | | |\ \ | | | | |/
| | | | * Fixed bug #61019 (Out of memory on command stream_get_contents)Michael Wallner2014-04-021-0/+4
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-04-021-1/+2
| |\ \ \ \ | | |/ / /