summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'php7_removals'POST_PHP7_REMOVALSAnatol Belski2015-02-10149-27243/+20
|\
| * updated NEWSAnatol Belski2015-02-101-0/+1
| * updated UPGRADINGAnatol Belski2015-02-101-2/+19
| * removed obsolete php.ini optionsAnatol Belski2015-02-102-184/+0
| * removed ext/sybase_ctAnatol Belski2015-02-1032-4006/+0
| * removed ext/mssqlAnatol Belski2015-02-106-2618/+0
| * removed sapi/webjamesAnatol Belski2015-02-105-406/+0
| * removed sapi/tuxAnatol Belski2015-02-105-555/+0
| * removed sapi/thttpdAnatol Belski2015-02-108-3307/+0
| * removed sapi/roxedAnatol Belski2015-02-104-831/+0
| * removed sapi/pi3webAnatol Belski2015-02-107-635/+0
| * removed sapi/phttpdAnatol Belski2015-02-106-356/+0
| * removed sapi/milterAnatol Belski2015-02-1010-1590/+0
| * removed sapi/isapiAnatol Belski2015-02-1010-2199/+0
| * removed sapi/continuityAnatol Belski2015-02-103-537/+0
| * removed sapi/caudiumAnatol Belski2015-02-105-928/+0
| * removed sapi/apache2filterAnatol Belski2015-02-1010-1732/+0
| * removed sapi/apache_hooksAnatol Belski2015-02-1014-4309/+0
| * removed sapi/apacheAnatol Belski2015-02-1014-2304/+0
| * removed sapi/aolserverAnatol Belski2015-02-106-744/+0
|/
* Revert "Improve and generalize class constant substitution"PRE_PHP7_REMOVALSBob Weinand2015-02-091-85/+31
* Merge branch 'PHP-5.6'Daniel Lowrey2015-02-091-16/+16
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-02-092-56/+170
| |\
| | * NEWSDaniel Lowrey2015-02-091-0/+4
| | * Miscellaneous cleanupDaniel Lowrey2015-02-091-28/+28
| | * Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5Daniel Lowrey2015-02-091-46/+152
| | |\
| | | * Update xp_ssl.cBrad Broerman2015-02-041-2/+2
| | | * reneg and should_close are not yet members of sslsock. Removing...Brad Broerman2015-01-281-9/+1
| | | * Updated with SSL fixes (backported from trunk)Brad Broerman2015-01-281-45/+159
* | | | Fixed dump_bt and printzvDmitry Stogov2015-02-091-2/+2
* | | | Avoid repeatable calls to strstr()Dmitry Stogov2015-02-092-1/+7
* | | | fix json globalsMichael Wallner2015-02-092-2/+1
* | | | Improve and generalize class constant substitutionBob Weinand2015-02-091-31/+85
* | | | regenerated scannerAnatol Belski2015-02-092-459/+460
* | | | fix datatype mismatchesAnatol Belski2015-02-093-7/+7
* | | | fix inconsistend dll linkage warnAnatol Belski2015-02-091-0/+5
* | | | size_t vs intAnatol Belski2015-02-091-1/+1
* | | | use size_t for str lengthAnatol Belski2015-02-092-2/+2
* | | | generate missing json files from config.w32Anatol Belski2015-02-091-0/+11
* | | | Merge branch 'master' of https://github.com/NikV/php-srcXinchen Hui2015-02-092-2/+5
|\ \ \ \
| * | | | Update README.TESTINGNikhil Vimal2015-02-071-2/+3
| * | | | Small Spacing adjustments for better readingNikhil Vimal2015-02-071-0/+2
* | | | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-092-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-092-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'improve-bug67436' of https://github.com/reeze/php-src into PHP-5.5Xinchen Hui2015-02-092-2/+2
| | |\ \ \
| | | * | | Improve tests for bug 67436Reeze Xia2015-02-072-2/+2
| | * | | | Shut up, my lovely compiler; I do not like your warningsBob Weinand2015-02-094-9/+4
| | * | | | Fixed #68790 (Missing return)George Wang2015-02-071-1/+1
| | |/ / /
* | | | | Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER.Márcio Almada2015-02-082-6/+0
* | | | | fix detection of mbstate_t with clangMichael Wallner2015-02-081-1/+1
View Lorry Controller Status