summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* removed ext/sybase_ctAnatol Belski2015-02-1032-4006/+0
* removed ext/mssqlAnatol Belski2015-02-106-2618/+0
* Merge branch 'PHP-5.6'Daniel Lowrey2015-02-091-16/+16
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-02-091-56/+167
| |\
| | * 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
| | * | Shut up, my lovely compiler; I do not like your warningsBob Weinand2015-02-092-6/+1
* | | | Avoid repeatable calls to strstr()Dmitry Stogov2015-02-092-1/+7
* | | | fix json globalsMichael Wallner2015-02-092-2/+1
* | | | 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
* | | | Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER.Márcio Almada2015-02-081-4/+0
* | | | fix detection of mbstate_t with clangMichael Wallner2015-02-081-1/+1
* | | | Merge branch 'master' into jsondJakub Zelenka2015-02-08153-5596/+8648
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.6'Anatol Belski2015-02-082-8/+24
| |\ \ \ \ | | |/ / /
| | * | | moved the part of the test into an appropriate placeAnatol Belski2015-02-082-8/+24
| * | | | Removed unused REGISTER_PDO_CONST_LONGMatteo Beccati2015-02-081-6/+0
| * | | | Merge branch 'PHP-5.6'Anatol Belski2015-02-083-0/+83
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'pull-request/1060' into PHP-5.6Anatol Belski2015-02-085-4/+87
| | |\ \ \
| | | * | | Fix another invalid free of CG(interned_empty_string)manuel2015-02-071-0/+7
| | | * | | add tests for #68996manuel2015-02-073-0/+76
| | | * | | Invalid free of CG(interned_empty_string)manuel2015-02-062-4/+4
| * | | | | added ODBCVER to phpinfo()Anatol Belski2015-02-071-0/+4
| * | | | | added PCRE JIT availability info to phpinfo()Anatol Belski2015-02-072-0/+23
| * | | | | Merge branch 'PHP-5.6'Anatol Belski2015-02-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-061-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | fix setting default ODBCVER value in config.w32Anatol Belski2015-02-061-1/+1
| * | | | | Merge branch 'PHP-5.6'Anatol Belski2015-02-064-8/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-064-8/+20
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Fixed bug #68964 Allowed memory size exhausted with odbc_execAnatol Belski2015-02-064-8/+20
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-061-3/+0
| | |\ \ \ | | | |/ /
| | | * | Removed erroneous conditionAnatol Belski2015-02-061-3/+0
| | | * | fix testsStanislav Malyshev2015-02-053-3/+3
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-053-9/+10
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-053-9/+10
| | | |\ \
| | | | * | Update header handling to RFC 7230Stanislav Malyshev2015-02-053-9/+10
| | | * | | fix test to not hit php.netStanislav Malyshev2015-02-052-2/+36
| | * | | | fix test to not hit php.netStanislav Malyshev2015-02-052-2/+36
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-042-18/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"Julien Pauli2015-02-042-18/+1
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-043-19/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-043-19/+2
| * | | | | Merge branch 'master' of https://github.com/mabes/php-srcXinchen Hui2015-02-066-12/+12
| |\ \ \ \ \