@@ -555,15 +555,6 @@ PHP_MSHUTDOWN_FUNCTION(curl)
555
555
}
556
556
/* }}} */
557
557
558
- /* {{{ curl_write_nothing
559
- * Used as a work around. See _php_curl_close_ex
560
- */
561
- static size_t curl_write_nothing (char * data , size_t size , size_t nmemb , void * ctx )
562
- {
563
- return size * nmemb ;
564
- }
565
- /* }}} */
566
-
567
558
/* {{{ curl_write */
568
559
static size_t curl_write (char * data , size_t size , size_t nmemb , void * ctx )
569
560
{
@@ -2679,20 +2670,6 @@ static void curl_free_obj(zend_object *object)
2679
2670
2680
2671
_php_curl_verify_handlers (ch , /* reporterror */ false);
2681
2672
2682
- /*
2683
- * Libcurl is doing connection caching. When easy handle is cleaned up,
2684
- * if the handle was previously used by the curl_multi_api, the connection
2685
- * remains open un the curl multi handle is cleaned up. Some protocols are
2686
- * sending content like the FTP one, and libcurl try to use the
2687
- * WRITEFUNCTION or the HEADERFUNCTION. Since structures used in those
2688
- * callback are freed, we need to use an other callback to which avoid
2689
- * segfaults.
2690
- *
2691
- * Libcurl commit d021f2e8a00 fix this issue and should be part of 7.28.2
2692
- */
2693
- curl_easy_setopt (ch -> cp , CURLOPT_HEADERFUNCTION , curl_write_nothing );
2694
- curl_easy_setopt (ch -> cp , CURLOPT_WRITEFUNCTION , curl_write_nothing );
2695
-
2696
2673
curl_easy_cleanup (ch -> cp );
2697
2674
2698
2675
/* cURL destructors should be invoked only by last curl handle */
0 commit comments