summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)Pierrick Charron2012-12-291-0/+16
| | | | | T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c Bugfix by Nikita for bug #60097
* Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2012-12-292-0/+13
|\
| * Add more tests for the new +0/-0 behaviour.Martin Jansen2012-12-291-0/+4
| |
| * Treat "+0" and "-0" as valid integers just like var_dump() does.Martin Jansen2012-12-292-0/+9
| | | | | | | | This fixes bug #54096.
* | Add new curl optionsPierrick Charron2012-12-281-0/+30
| | | | | | | | | | | | Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION, CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE, CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.
* | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-271-0/+3
|\ \ | |/ | | | | | | * PHP-5.4: Fixed #63859 Memory leak when reusing curl-handle
| * Fixed #63859 Memory leak when reusing curl-handlePierrick Charron2012-12-271-0/+3
| | | | | | | | | | | | | | | | | | When CURLOPT_POSTFIELDS is called more than once on the same curl handle, php/curl did not free the memory of the previous post data. This commit will fix the problem unless the curl handle was previously duplicated using the curl_copy_handle() function in which case we can not know if the post data is still in use or not by any curl handle
* | Fix ext/curl tests to work on every libcurl versionsPierrick Charron2012-12-264-10/+18
| | | | | | | | Thanks Laruence :)
* | New curl_pause() functionPierrick Charron2012-12-232-0/+43
| | | | | | | | | | | | | | Add the curl_pause function (binding of curl_easy_pause). Using this function, you can explicitly mark a running connection to get paused, and you can unpause a connection that was previously paused.
* | Support for curl_strerror and curl_multi_strerrorPierrick Charron2012-12-235-2/+106
| | | | | | | | | | | | Add the support for both curl_strerror and curl_multi_strerror. Those function will return a string describing the error code passed in the argument errornum
* | Add curl_multi_setopt and clean curl_share_setoptPierrick Charron2012-12-236-6/+120
| | | | | | | | | | curl_multi_setopt is now available and supports CURLMOPT_PIPELINING and CURLMOPT_MAXCONNECTS
* | Remove duplicated function definitionPierrick Charron2012-12-231-20/+14
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-222-0/+80
|\ \ | |/ | | | | | | | | * PHP-5.4: Update NEWS file Fixed segfault due to libcurl connection caching
| * Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-222-0/+80
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed segfault due to libcurl connection caching
| | * Fixed segfault due to libcurl connection cachingPierrick Charron2012-12-222-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libcurl is doing connection caching. When easy handle is cleaned up, if the handle was previously used by the curl_multi_api, the connection remains open un the curl multi handle is cleaned up. Some protocols are sending content like the FTP one, and libcurl try to use the WRITEFUNCTION or the HEADERFUNCTION. Since structures used in those callback are freed, we need to use an other callback to which avoid segfaults. Libcurl commit d021f2e8a00 fix this issue and should be part of 7.28.2
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-214-8/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: Update NEWS file Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers) CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
| * | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-214-8/+48
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Update NEWS file Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers) CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST) Conflicts: ext/curl/interface.c ext/curl/tests/bug63363.phpt
| | * Fixed bug #63352 (Can't enable hostname validation when using curl stream ↵Pierrick Charron2012-12-211-2/+2
| | | | | | | | | | | | wrappers)
| | * CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)Pierrick Charron2012-12-213-1/+78
| | | | | | | | | | | | Fixed bug #63795
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-211-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Fix test to work on every libcurl version - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
| * | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-211-8/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fix test to work on every libcurl version - Fixed typo on "SKIPIF" (causing make test to abort on some systems) Conflicts: tests/output/bug63377.phpt
| | * Fix test to work on every libcurl versionPierrick Charron2012-12-211-4/+4
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-211-0/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fix test
| * | Fix testPierrick Charron2012-12-211-0/+5
| | | | | | | | | | | | | | | This test is only valid if libcurl < 7.28.1 since libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
* | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-192-13/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #55438 (Curlwapper is not sending http header randomly)
| * | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-192-13/+10
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #55438 (Curlwapper is not sending http header randomly)
| | * Fixed bug #55438 (Curlwapper is not sending http header randomly)Pierrick Charron2012-12-192-13/+10
| | | | | | | | | | | | | | | | | | Since curl multi is used, it sometime happen that the resource is freed before the curl multi really execute the query. The patch will store the headers slist in the curlstream handle and free it only when the stream will be closed
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2012-12-191-42/+95
|\ \ \ | |/ / | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd_alloc.c
| * | Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4Andrey Hristov2012-12-191-1/+1
| |\ \
| * | | be cautious about the result of strrchrAndrey Hristov2012-12-181-14/+84
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-12-191-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * PHP-5.4: fix failing test on Linux build
| * | | fix failing test on Linux buildRemi Collet2012-12-191-1/+1
| |/ /
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-12-171-33/+34
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-12-171-33/+34
| |\ \ | | |/
| | * dos2unix & skip on connect failXinchen Hui2012-12-171-33/+34
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-12-171-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-12-171-1/+1
| |\ \ | | |/
| | * Fix failed testXinchen Hui2012-12-171-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-131-0/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Rasmus Lerdorf2012-12-131-0/+1
| |\ \ | | |/
| | * Need connect.inc hereRasmus Lerdorf2012-12-131-0/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-131-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Rasmus Lerdorf2012-12-131-1/+1
| |\ \ | | |/
| | * Fix broken testRasmus Lerdorf2012-12-131-1/+1
| | | | | | | | | | | | | | | Need to use the configured connection parameters here. We can't assume the test user has access.
* | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-131-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Rasmus Lerdorf2012-12-131-1/+1
| |\ \ | | |/
| | * Fix broken testRasmus Lerdorf2012-12-131-1/+1
| | | | | | | | | | | | This was missing a %s for the path here
* | | Merge branch 'PHP-5.4' into PHP-5.5Arpad Ray2012-12-133-1/+114
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fix #63379 - Don't reset mod_user_is_open in destroy
| * | Fix #63379 - Don't reset mod_user_is_open in destroyArpad Ray2012-12-133-1/+114
| | | | | | | | | | | | The parent handler is still open so the reset here was in error.
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-12-131-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed mysqlnd compilation in debug mode on windows
View Lorry Controller Status