summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5'Christopher Jones2013-08-161-4/+38
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-161-4/+38
| |\
| | * With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris andChristopher Jones2013-08-161-4/+38
* | | Merge branch 'PHP-5.5'David Soria Parra2013-08-150-0/+0
|\ \ \ | |/ /
| * | New news sectionDavid Soria Parra2013-08-151-0/+2
| * | Prepare news for PHP-5.5.2David Soria Parra2013-08-151-1/+1
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-140-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-140-0/+0
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-08-141-3/+3
| | |\
| * | \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-08-141-3/+3
| |\ \ \
* | \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-08-141-3/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.5'Xinchen Hui2013-08-151-3/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-151-3/+3
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed #65431 in zend_exception.c by SixdXinchen Hui2013-08-151-3/+3
* | | | | | Remove unused variableChristopher Jones2013-08-141-1/+0
* | | | | | Merge branch 'PHP-5.5'Christopher Jones2013-08-143-3/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Reduce compiler noise by removing unused variables and labelsChristopher Jones2013-08-143-3/+2
* | | | | | Merge branch 'PHP-5.5'Christopher Jones2013-08-1421-31/+30
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-1421-31/+30
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Reduce (some) compile noise of 'unused variable' and 'may be used uninitializ...Christopher Jones2013-08-1423-33/+31
| | |/
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-141-0/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-0/+1
| |\ \ | | |/
| | * Skip test if SKIP_ONLINE_TESTS setChristopher Jones2013-08-141-0/+1
* | | Fix to file uploads >2G with size overflowAnatol Belski2013-08-141-8/+29
* | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-133-2/+131
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-134-2/+135
| |\ \ | | |/
| | * Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-08-130-0/+0
| | |\
| | | * Fix CVE-2013-4073 - handling of certs with null bytesStanislav Malyshev2013-08-134-2/+135
| | * | Fix CVE-2013-4073 - handling of certs with null bytesStanislav Malyshev2013-08-134-2/+135
* | | | Merge branch 'PHP-5.5'Xinchen Hui2013-08-145-16/+16
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-08-145-16/+16
| |\ \ \ | | |/ /
| | * | Fixed #65431 (Discarded qualifiers from pointer target warnings when using --...Xinchen Hui2013-08-145-16/+16
* | | | Fix unused variable warning in OCI8 2.0Christopher Jones2013-08-131-4/+4
* | | | Merge branch 'PHP-5.5'Anatol Belski2013-08-121-2/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-08-121-2/+1
| |\ \ \ | | |/ /
| | * | removed unused varsAnatol Belski2013-08-121-2/+1
* | | | Merge branch 'PHP-5.5'Anatol Belski2013-08-121-3/+25
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-08-121-3/+25
| |\ \ \ | | |/ /
| | * | fixed strndup usage in the pgsql extAnatol Belski2013-08-121-3/+25
* | | | Fixes to unified stdint usageAnatol Belski2013-08-122-29/+13
* | | | Fixed bug #65382 (Segfault in closure_030.phpt)Dmitry Stogov2013-08-122-5/+5
* | | | Revise pgsql test filesYasuo Ohgaki2013-08-122-1/+7
* | | | Revise pgsql test for Travis CIYasuo Ohgaki2013-08-111-0/+2
* | | | Add 00version.phpt to get server/protocol/client version. Revise test script ...Yasuo Ohgaki2013-08-119-8/+34
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-111-3/+3
|\ \ \ \ | |/ / /
| * | | use mysqlnd, some tests fail otherwiseStanislav Malyshev2013-08-111-3/+3
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-103-1/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-103-1/+5
| |\ \ \ | | |/ /
| | * | ensure notices are not ignored when tests need themStanislav Malyshev2013-08-103-1/+5
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-08-1035-0/+678
|\ \ \ \ | |/ / /