summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* unify stdint type usageMichael Wallner2013-08-0618-266/+17
* Check for NULL ptr from get_stream() before passing it on to php_stream_cast()Kalle Sommer Nielsen2013-08-051-2/+6
* Merge branch 'PHP-5.5'Yasuo Ohgaki2013-08-0515-62/+184
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-08-0515-62/+184
| |\
| | * Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is ...Yasuo Ohgaki2013-08-0515-62/+184
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-0439-95/+264
|\ \ \ | |/ /
| * | Merge branch 'pr368' into PHP-5.5Stanislav Malyshev2013-08-0439-95/+264
| |\ \
| | * | fix crash, enable session_id and fix testStanislav Malyshev2013-08-043-6/+2
| | * | Strict session. Detect session id collisionYasuo Ohgaki2013-08-042-2/+28
| | * | Strict sessionYasuo Ohgaki2013-08-0438-93/+240
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-046-57/+107
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-046-57/+107
| |\ \ \ | | | |/ | | |/|
| | * | First fixes for a 64bit compatible ftp extensionAndreas Streichardt2013-08-046-57/+107
* | | | Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOT...Stanislav Malyshev2013-08-041-1/+1
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-041-1/+1
|\ \ \ \ | |/ / /
| * | | fix compiler warning, use longs for hashesStanislav Malyshev2013-08-041-1/+1
| | |/ | |/|
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-0433-33/+33
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-0433-33/+33
| |\ \ | | |/
| | * non living code related typo fixesVeres Lajos2013-08-0433-33/+33
* | | Merge commit '626d96a'Rasmus Lerdorf2013-08-031-2/+0
|\ \ \ | |/ /
| * | This doesn't fail in 5.5 anymoreRasmus Lerdorf2013-08-031-2/+0
| * | Merge commit 'a03f094' into PHP-5.5Rasmus Lerdorf2013-08-022-2/+2
| |\ \ | | |/
| * | Merge commit 'd60e168' into PHP-5.5Rasmus Lerdorf2013-08-021-1/+1
| |\ \
| * \ \ Merge commit 'ea75b1b' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+1
| |\ \ \
| * \ \ \ Merge commit 'e55f08a' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+2
| |\ \ \ \
* | | | | | Fix phar phpinfo test after markup changesNikita Popov2013-08-031-15/+15
* | | | | | Merge commit 'a03f094'Rasmus Lerdorf2013-08-022-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | We shouldn't load any local ini files for these testsRasmus Lerdorf2013-08-022-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge commit 'd60e168'Rasmus Lerdorf2013-08-021-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | pcre_quote? No such thing. How did this ever pass?Rasmus Lerdorf2013-08-021-1/+1
| | |_|/ | |/| |
* | | | Merge commit 'ea75b1b'Rasmus Lerdorf2013-08-021-0/+1
|\ \ \ \ | |/ / /
| * | | This test needs local infile enabledRasmus Lerdorf2013-08-021-0/+1
| | |/ | |/|
* | | Merge commit 'e55f08a'Rasmus Lerdorf2013-08-021-0/+2
|\ \ \ | |/ /
| * | This test will only work if gc is enabledRasmus Lerdorf2013-08-021-0/+2
* | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-021-3/+11
|\ \ \ | | |/ | |/|
| * | Fixed tests (inet_pton behaves differently on Darwin)Xinchen Hui2013-08-021-3/+11
* | | Merge branch 'PHP-5.5'Yasuo Ohgaki2013-08-021-0/+17
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2013-08-021-0/+17
| |\ \ | | |/
| | * Add user contributed test. Bug #61748Yasuo Ohgaki2013-08-021-0/+17
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-012-2/+2
|\ \ \ | |/ /
| * | Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"Christopher Jones2013-08-012-2/+2
* | | Merge branch 'PHP-5.5'Christopher Jones2013-07-312-2/+2
|\ \ \ | |/ /
| * | Allow 'make distclean' to clean up the 'generated' phar.incChristopher Jones2013-07-312-2/+2
* | | Merge branch 'pull-request/399'Sara Golemon2013-07-3123-76/+80
|\ \ \
| * | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-3023-76/+80
* | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-311-5/+49
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-07-311-5/+49
| |\ \ \ | | | |/ | | |/|
| | * | Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)Dmitry Stogov2013-07-311-5/+49
* | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-312-38/+83
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-07-312-38/+83
| |\ \ \ | | |/ /