summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4Andrey Hristov2013-08-0891-450/+819
| |\ \ \
* | \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-08-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Andrey Hristov2013-08-080-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2013-07-222-6/+19
| | |\ \ \
* | | \ \ \ Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-08-082-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-072-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Remove tabs on blanklines in Makefile sources. This prevents aChristopher Jones2013-08-072-2/+2
| | * | | | | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-08-062-0/+5
| | |\ \ \ \ \
* | | | | | | | add some tracingAndrey Hristov2013-08-081-6/+13
|/ / / / / / /
* | | | | | | One more './configure --help' alignment fixChristopher Jones2013-08-061-1/+2
* | | | | | | Fix long-standing visual pain point: the misalignment of './configure help' t...Christopher Jones2013-08-0660-125/+126
* | | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-062-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-062-0/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fa...Xinchen Hui2013-08-062-0/+5
| | |/ / / / /
* | | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-051-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | PHP 5.5.2 has already branchedChristopher Jones2013-08-051-3/+5
| * | | | | | Doh. PHP 5.5 NEWS needs own commit.Christopher Jones2013-08-051-0/+2
* | | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-05123-301/+740
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | NEWS for recent DTrace merges.Christopher Jones2013-08-052-1/+5
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-050-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed bug #62691 (solaris sed has no -i switch)Christopher Jones2013-08-052-2/+2
| | * | | | | Enable dtrace probes on linux as they are compatible with systemtapDavid Soria Parra2013-08-051-0/+3
| | * | | | | Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17Remi Collet2013-08-051-2/+2
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-051-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add an empty make command for DTrace .d files to stop an implicitChristopher Jones2013-08-051-0/+4
| | * | | | | Merge branch 'PHP-5.4'Kalle Sommer Nielsen2013-08-051-2/+6
| * | | | | | Merge branch 'PHP-5.5'Kalle Sommer Nielsen2013-08-051-2/+6
| * | | | | | 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
| * | | | | | add news about session fixStanislav Malyshev2013-08-042-0/+12
| * | | | | | 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.4' into PHP-5.5Stanislav Malyshev2013-08-046-57/+107
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | First fixes for a 64bit compatible ftp extensionAndreas Streichardt2013-08-046-57/+107
| * | | | | | | fix compiler warning, use longs for hashesStanislav Malyshev2013-08-041-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-0448-50/+50
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | non living code related typo fixesVeres Lajos2013-08-0448-50/+50
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | fix typoStanislav Malyshev2013-08-041-1/+1
| * | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | We shouldn't load any local ini files for these testsRasmus Lerdorf2013-08-022-2/+2
| * | | | | | Merge commit 'd60e168' into PHP-5.5Rasmus Lerdorf2013-08-021-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | pcre_quote? No such thing. How did this ever pass?Rasmus Lerdorf2013-08-021-1/+1
| * | | | | | Merge commit 'ea75b1b' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | This test needs local infile enabledRasmus Lerdorf2013-08-021-0/+1
| * | | | | | Merge commit 'e55f08a' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+2
| |\ \ \ \ \ \ | | |/ / / / /