summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.5.12RC1php-5.5.12RC1Julien Pauli2014-04-153-10/+7
* 5.5.12RC1 setupJulien Pauli2014-04-153-5/+8
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-141-2/+2
|\
| * Fix test - on CI somebody could create a process in the meantimeStanislav Malyshev2014-04-141-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-141-1/+7
|\ \ | |/
| * fix windows buildAnatol Belski2014-04-141-1/+7
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-143-24/+31
|\ \ | |/
| * Fix #66942: openssl_seal() memory leakChuan Ma2014-04-142-12/+16
| * ws fixStanislav Malyshev2014-04-141-12/+12
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Andrey Hristov2014-04-1416-27/+1456
|\ \
| * \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-140-0/+0
| |\ \ | | |/
| | * Fix null byte in LDAP bindingsStanislav Malyshev2014-04-142-0/+13
| | * Fix bug #66171: better handling of symlinksStanislav Malyshev2014-04-142-17/+22
| * | Fix null byte in LDAP bindingsStanislav Malyshev2014-04-141-0/+10
| * | Fix bug #66171: better handling of symlinksStanislav Malyshev2014-04-141-17/+20
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-1414-10/+1426
| |\ \ | | |/
| | * backported some ext/intl tests from 5.6 into 5.4Anatol Belski2014-04-1438-19/+3652
* | | Add testAndrey Hristov2014-04-141-0/+119
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-04-142-4/+4
|\ \ | |/
| * Fixed bug #67033 Remove reference to Windows 95Anatol Belski2014-04-142-4/+4
* | MErge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-130-0/+0
|\ \ | |/
| * fix NEWSStanislav Malyshev2014-04-131-0/+4
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-133-8/+34
|\ \ | |/
| * Merge branch 'pull-request/518' into PHP-5.4Stanislav Malyshev2014-04-132-8/+30
| |\
| | * Fix #66021 (Blank line inside empty array/object)Kevin Israel2013-11-022-8/+30
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-133-4/+46
|\ \ \ | |/ /
| * | Fixed bug #64604Ingo Walz2014-04-133-4/+46
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-0/+6
|\ \ \ | |/ /
| * | Fix #66562: Consistency bug where curl_multi_getcontent behaves different fro...Freek2014-04-132-0/+6
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-1/+4
|\ \ \ | |/ /
| * | Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in...itxx002014-04-132-1/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-0/+3
|\ \ \ | |/ /
| * | Fix windows buildStanislav Malyshev2014-04-131-0/+3
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-133-0/+19
|\ \ \ | |/ /
| * | Fix bug #66721Boro Sitnikovski2014-04-133-0/+19
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-132-1/+6
|\ \ \ | |/ /
| * | fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cceJeff Trawick2014-04-132-1/+6
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-135-2/+22
|\ \ \ | |/ /
| * | Fixed bug #67024 - getimagesize should recognize BMP files with negative heightGabor Buella2014-04-135-2/+22
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-133-23/+1
|\ \ \ | |/ /
| * | Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9Bob Weinand2014-04-133-23/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-132-1/+3
|\ \ \ | |/ /
| * | Forgot title in phpt for bug #67064Bob Weinand2014-04-131-1/+1
| * | Updated NEWSBob Weinand2014-04-131-0/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-132-1/+21
|\ \ \ | |/ /
| * | Fix bug #67064 in a BC safe wayBob Weinand2014-04-132-1/+21
* | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-04-131-1/+1
|\ \ \ | |/ /
| * | fix typoFerenc Kovacs2014-04-131-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Bob Weinand2014-04-121-1/+1
|\ \ \ | |/ /
| * | Made usage of php_hash_environment useful by updating instead of just adding ...Bob Weinand2014-04-121-1/+1