summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.6.6php-5.6.6PHP-5.6.6Ferenc Kovacs2015-02-182-3/+3
|
* update NEWSFerenc Kovacs2015-02-181-14/+28
|
* Add NULL byte protection to exec, system and passthruYasuo Ohgaki2015-02-182-0/+29
|
* Update header handling to RFC 7230Stanislav Malyshev2015-02-184-16/+12
|
* Port for for bug #68552Stanislav Malyshev2015-02-181-4/+3
|
* fix TS buildStanislav Malyshev2015-02-181-2/+2
|
* Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)Stanislav Malyshev2015-02-183-11/+28
|
* Fix bug #69033 (Request may get env. variables from previous requests if PHP ↵Ferenc Kovacs2015-02-181-0/+3
| | | | works as FastCGI)
* Updated NEWS to reflect changes in the branchJulien Pauli2015-02-071-4/+0
|
* Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"Julien Pauli2015-02-052-18/+1
| | | | This reverts commit 8e19705a93d785cd1ff8ba3a69699b00169fea47.
* 5.6.6RC1php-5.6.6RC1Julien Pauli2015-02-043-4/+4
|
* Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-043-19/+2
|\ | | | | | | | | | | * PHP-5.5: Revert "json_decode() should generate a syntax error when given ""." Update NEWS
| * Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-043-19/+2
| | | | | | | | This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.
| * Update NEWSYasuo Ohgaki2015-02-031-0/+5
| |
* | make buildconf work as expected;Michael Wallner2015-02-041-1/+2
| | | | | | | | autoconf really needs some help with all those external m4s
* | Fixed indentXinchen Hui2015-02-031-1/+1
| |
* | Update NEWSYasuo Ohgaki2015-02-031-0/+7
| |
* | Fixed Bug #67988 htmlspecialchars() does not respect default_charset ↵Yasuo Ohgaki2015-02-033-14/+35
| | | | | | | | specified by ini_set.
* | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-032-10/+66
|\ \ | |/ | | | | | | * PHP-5.5: Fixed Bug #65199 pg_copy_from() modifies input array variable
| * Fixed Bug #65199 pg_copy_from() modifies input array variableYasuo Ohgaki2015-02-032-10/+66
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-031-2/+5
|\ \ | |/ | | | | | | * PHP-5.5: Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
| * Fixed Bug #66623 no EINTR check on flock(LOCK_EX)Yasuo Ohgaki2015-02-031-2/+5
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-032-0/+25
|\ \ | |/ | | | | | | * PHP-5.5: Fixed bug #68063 Empty session IDs do still start sessions
| * Fixed bug #68063 Empty session IDs do still start sessionsYasuo Ohgaki2015-02-032-0/+25
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-031-21/+0
|\ \ | |/ | | | | | | * PHP-5.5: Bug #61470 is fixed only in master
| * Bug #61470 is fixed only in masterYasuo Ohgaki2015-02-031-21/+0
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2015-02-023-0/+34
|\ \ | |/ | | | | | | Conflicts: ext/standard/file.c
| * Fixed bug #65272: correctly set flock() out param in windowsDaniel Lowrey2015-02-023-0/+34
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-02-021-2/+2
|\ \ | |/
| * Let's not assume bash is always /bin/bash.Adam Harvey2015-02-021-2/+2
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-02-024-2/+23
|\ \ | |/
| * json_decode() should generate a syntax error when given "".Adam Harvey2015-02-024-2/+23
| | | | | | | | | | Fixes bug #68938 (json_decode() decodes empty string without error). Patch by jeremy at bat-country dot us.
* | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-021-0/+21
|\ \ | |/ | | | | | | * PHP-5.5: Add test for bug #61470. It is already fixed.
| * Add test for bug #61470. It is already fixed.Yasuo Ohgaki2015-02-021-0/+21
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-011-1/+1
|\ \ | |/ | | | | | | * PHP-5.5: fix sizeof size
| * Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2015-02-011-17289/+17211
| |\ | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: - Updated to version 2015.1 (2015a)
| * \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | * PHP-5.4: fix sizeof size
| | * | fix sizeof sizeStanislav Malyshev2015-02-011-1/+1
| | | |
* | | | - Updated to version 2015.1 (2015a)Derick Rethans2015-02-011-17289/+17211
| | | |
* | | | Empty mergeDerick Rethans2015-02-010-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | - Updated to version 2015.1 (2015a)Derick Rethans2015-02-011-17289/+17211
| |/ /
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-012-2/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix #66479: Wrong response to FCGI_GET_VALUES
| * | Fix #66479: Wrong response to FCGI_GET_VALUESFrank Stolle2015-02-012-2/+5
| | | | | | | | | | | | | | | | | | | | | Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug. Conflicts: sapi/cgi/fastcgi.c
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-012-0/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
| * | Fix bug #64938: libxml_disable_entity_loader setting is shared between threadsMartin Jansen2015-02-012-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The availability of entity loading is stored in a module global which previously was only initialized in the GINIT constructor. This had the effect that disabling the entity loader in one request caused subsequent requests hitting the same Apache child process to also have the loader disabled. With this change the loader is explicitely enabled in the request init phase.
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix group name handling
| * | fix group name handlingStanislav Malyshev2015-01-311-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix TSRM
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-311-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: fix TSRM
| | * fix TSRMStanislav Malyshev2015-01-311-2/+2
| | |