summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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-272-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Revert "Remove a useless memory write in zend_llist_del_element"
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-261-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Revert "Remove a useless memory write in zend_llist_del_element"Pierrick Charron2012-12-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fad960a4045da86cdbd8308a165ffc47892f05b9 as required by Stas and Christopher
* | | | | Fix ext/curl tests to work on every libcurl versionsPierrick Charron2012-12-264-10/+18
| | | | | | | | | | | | | | | | | | | | Thanks Laruence :)
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-251-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Remove a useless memory write in zend_llist_del_element
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-251-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.3: Remove a useless memory write in zend_llist_del_element
| | * | | Remove a useless memory write in zend_llist_del_elementPierrick Charron2012-12-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The zend_llist_element *next pointer is not necessary and removing it will also remove a write on memory
* | | | | spellingDmitry Stogov2012-12-251-3/+3
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-252-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: spelling
| * | | | spellingDmitry Stogov2012-12-252-5/+5
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-251-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed ZTS build
| * | | | Fixed ZTS buildDmitry Stogov2012-12-251-2/+2
| | | | |
* | | | | Removed deprecated fieldsDmitry Stogov2012-12-252-8/+0
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-2518-429/+341
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Traits refactoring
| * | | | Traits refactoringDmitry Stogov2012-12-2518-429/+341
| | | | |
* | | | | Implement Generator::throw() methodNikita Popov2012-12-247-5/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator::throw($exception) throws an exception into the generator. The exception is thrown at the current point of suspension within the generator. It basically behaves as if the current yield statement were replaced with a throw statement and the generator subsequently resumed.
* | | | | Update NEWSPierrick Charron2012-12-231-0/+5
| | | | |
* | | | | 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
| * | | | Update NEWS filePierrick Charron2012-12-221-0/+1
| | | | |
| * | | | 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-223-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-215-8/+52
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | Update NEWS filePierrick Charron2012-12-211-0/+4
| | | | |
| | * | | 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
| | | | |
| | * | | - Fixed typo on "SKIPIF" (causing make test to abort on some systems)Felipe Pena2012-12-201-1/+1
| | | | |
* | | | | 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.
* | | | | Fix crash when last yielded value is a closureNikita Popov2012-12-212-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If zend_generator_close is called from within zend_generator_resume (e.g. due to a return statement) then all the EGs will still be using the values from the generator. That's why the stack frame has to be the last thing that is dtored, otherwise some other dtor that is using EG(current_execute_data) might access the already freed memory segment. This was the case with the closure dtor. The fix is to move the dtors for key and value to the start of the handler. This way the stack frame is the last thing that is freed.
* | | | | Fix bug #63822: Crash when using closures with ArrayAccessNikita Popov2012-12-213-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | op_array->T was used after the closure's op_array was already freed. This just swaps the freeing order.
* | | | | Do not add a ref to EX(object) on generator cloneNikita Popov2012-12-202-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | If a ref has to be added it will be already added while walking the call slots.
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-191-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix for bug #63811Rasmus Lerdorf2012-12-191-1/+1
| | | | |
* | | | | 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-193-13/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * 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-193-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.5Johannes Schlüter2012-12-190-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-12-190-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Update release dateJohannes Schlüter2012-12-191-3/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2012-12-191-42/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: ext/mysqlnd/mysqlnd_alloc.c