summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.18php-5.5.18PHP-5.5.18Julien Pauli2014-10-153-4/+17
|
* Fix bug #68113 (Heap corruption in exif_thumbnail())Stanislav Malyshev2014-10-154-3/+20
|
* Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-152-0/+23
| | | | | Conflicts: ext/curl/interface.c
* Fixed bug #68044: Integer overflow in unserialize() (32-bits only)Stanislav Malyshev2014-10-153-3/+15
|
* Fix bug #68027 - fix date parsing in XMLRPC libStanislav Malyshev2014-10-152-5/+52
|
* Revert "Merge branch 'PHP-5.4' into PHP-5.5"php-5.5.18RC1Julien Pauli2014-10-011-31/+1
| | | | | | | | This reverts commit 5ac2e5f850c483394870dadca465c1322a4a51cf, reversing changes made to 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec. Conflicts: ext/openssl/xp_ssl.c
* 5.5.18RC1Julien Pauli2014-10-013-4/+7
|
* Revert "Merge branch 'PHP-5.5' into PHP-5.6"Julien Pauli2014-10-011-18/+1
| | | | | | | | This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147. Conflicts: ext/openssl/xp_ssl.c
* Revert "fix TS build"Julien Pauli2014-10-011-1/+1
| | | | This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
* Revert "Merge branch 'PHP-5.4' into PHP-5.5"Julien Pauli2014-10-013-20/+4
| | | | | This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
* Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"Julien Pauli2014-10-011-13/+11
| | | | This reverts commit f86b2193a483f56b0bd056570a0cdb57ebe66e2f.
* Revert "Bug #41631: Fix regression from first attempt (6569db8)"Julien Pauli2014-10-011-1/+1
| | | | This reverts commit 372844918a318ad712e16f9ec636682424a65403.
* use $PHP_LIBDIR instread of "lib" in skel exampleRemi Collet2014-10-011-2/+2
|
* fix test filenameAnatol Belski2014-09-291-2/+2
|
* one more test to illustrate transfer of an arbitrary data amount throug pipesAnatol Belski2014-09-291-0/+84
|
* fix tests on linuxAnatol Belski2014-09-292-2/+10
|
* better test cleanupAnatol Belski2014-09-292-6/+13
| | | | and even force the XFAIL to fail as it would take too long anyway, even if it passes
* increase the polling period to not to break existing behavioursAnatol Belski2014-09-291-1/+1
|
* Fixed bug #51800 proc_open on Windows hangs foreverAnatol Belski2014-09-296-0/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This loop can block for some minutes, theoretically. Practially however, this is a 99% non issue for a normal use case. This is required because read() is synchronous. The PHP streams API wants to fill its internal buffers, therefore it might try to read some more data than user has demanded. Also, for a case where we want to read X bytes, but neither enough data nor EOF arrives, read() will block until it could fill the buffer. If a counterpart station runs slowly or delivers not all the data at once, read() would still be waiting. If we quit too early, we possibly could loose some data from the pipe. Thus it has to emulate the read() behaviour, but obviously not completely, just to some grade. Reading big data amount is for sure an issue on any platforms, it depends on the pipe buffer size, which is controlled by the system. On Windows, the buffer size seems to be way too small, which causes buffer congestion and a dead lock. It is essential to read the pipe descriptors simultaneously and possibly in the same order as the opposite writes them. Thus, this will work with smaller buffer data sizes passed through pipes. As MSDN states, anonymous pipes don't support asynchronous operations. Neither anonymous pipes do support select() as they are not SOCKETs but file descriptors. Consequently - bigger data sizes will need a better solution based on threads. However it is much more expencive. Maybe a better solution could be exporting a part of the internal doing as a userspace function which could perform some kind of lookahead operation on the pipe descriptor. This is just the first stone, depending on the user feedback we might go for further improvements in this area.
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-281-2/+21
|\ | | | | | | | | * PHP-5.4: Set an LDAP error code when failing ldap_bind due to null bytes
| * Set an LDAP error code when failing ldap_bind due to null bytesMatthew Daley2014-09-281-2/+21
| | | | | | | | | | | | | | | | Some applications check a LDAP link's error code after seeing ldap_bind fail due to a null byte bind attempt and hence incorrectly receive the last set error code. Fix by setting an LDAP error code before returning in this case.
* | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
|\ \ | |/
| * This test should passJohannes Schlüter2014-09-271-2/+0
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-09-261-608/+610
|\ \ | |/
| * - Updated to version 2014.8 (2014h)Derick Rethans2014-09-261-608/+610
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-09-260-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.4: update NEWS Revert xp_ssl.c to the state of 5.4.32 due to regressions Conflicts: ext/openssl/xp_ssl.c
| * update NEWSStanislav Malyshev2014-09-261-1/+4
| |
| * Revert xp_ssl.c to the state of 5.4.32 due to regressionsStanislav Malyshev2014-09-261-61/+0
| |
* | fix dateStanislav Malyshev2014-09-261-1/+1
| |
* | NEWSRemi Collet2014-09-261-0/+3
| |
* | Fixed bug #68103 Dupplicate entry in ReflectionRemi Collet2014-09-261-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());' Array ( [0] => Threaded [1] => stackable [2] => Thread [3] => Worker [4] => Mutex [5] => Cond [6] => Collectable [7] => Pool ) In getClasses() output, it is possible to compare key (ex "stackable") with $obj->name (ex "Threaded") to detect class alias. ... [Threaded] => ReflectionClass Object ( [name] => Threaded ) [stackable] => ReflectionClass Object ( [name] => Threaded ) ...
* | Merge branch 'PHP-5.4' into PHP-5.5Ard Biesheuvel2014-09-201-1/+1
|\ \ | |/
| * Fixed bug #66242 (don't assume char is signed)Ard Biesheuvel2014-09-201-1/+1
| | | | | | | | | | | | | | | | | | This fixes a bug in libmagic where a cast to 'char' is assumed to result in sign extension to occur. However, unqualified 'char' is unsigned on architectures such as ARM, so the cast needs to be to 'signed char' explicitly. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
* | Fixed bug #67633Nikita Popov2014-09-203-0/+55
| |
* | fix possible array underflowAnatol Belski2014-09-191-3/+3
| | | | | | | | | | | | | | | | there are multiple issues with this code - php_stream_read() returns an unsigned val, so is >= 0 - if it read less than sizeof(a) bytes, the function operates on garbage - result->channels is an unsigned val, so >= 0
* | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-09-162-30/+4
|\ \ | |/ | | | | | | * PHP-5.4: Fixed freetype test on multiple environments
| * Fixed freetype test on multiple environmentsMatteo Beccati2014-09-162-30/+4
| | | | | | | | | | | | Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;) This reverts commit 592df890276604c790d02be26b1b3c3710b3b888.
* | NEWSRemi Collet2014-09-151-0/+4
| |
* | Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when ↵Remi Collet2014-09-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using Apache ProxyPass is unable to provide correct PATH_INFO as it is not aware of file path (while SetHandler is). As we can extract PATH_INFO from PATH_TRANSLATED, we also need to check if present in SCRIPT_NAME and remove it. After applying this patch. With mod_php _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foor/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + SetHandler _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + ProxyPass _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1
* | updated NEWSAnatol Belski2014-09-151-0/+2
| |
* | Fix NEWSRemi Collet2014-09-151-2/+1
| | | | | | | | | | - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-09-150-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
| * Fix NEWSRemi Collet2014-09-151-2/+1
| | | | | | | | | | - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8b303945945c650d4bc90dcc2ac0b17
* | fixed the cast and incompatible pointer warningAnatol Belski2014-09-121-2/+2
| |
* | reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0Anatol Belski2014-09-111-1/+1
| |
* | fix precision when fetching float through mysqlndAnatol Belski2014-09-101-1/+11
| | | | | | | | fixes failing ext/mysqli/tests/010.phpt
* | make LTP version check a blacklistMichael Wallner2014-09-101-8/+22
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-09-091-12/+14
|\ \ | |/ | | | | | | | | * PHP-5.4: Bug #41631: Fix regression from first attempt (6569db8) Bug #67965: Fix blocking behavior in non-blocking crypto streams
| * Bug #41631: Fix regression from first attempt (6569db8)Daniel Lowrey2014-09-091-1/+1
| |
| * Bug #67965: Fix blocking behavior in non-blocking crypto streamsDaniel Lowrey2014-09-091-11/+13
| |
View Lorry Controller Status