Merge pull request php-curl-class#522 from zachborboa/master

Fix memory leak when class object is unset, but not manually closed

Author: zachborboa

src/Curl/Curl.php

@@ -122,7 +122,7 @@ public function __construct($base_url = null)
         $header_callback_data->rawResponseHeaders = '';
         $header_callback_data->responseCookies = array();
         $this->headerCallbackData = $header_callback_data;
-        $this->setOpt(CURLOPT_HEADERFUNCTION, $this->createHeaderCallback($header_callback_data));
+        $this->setOpt(CURLOPT_HEADERFUNCTION, createHeaderCallback($header_callback_data));
 
         $this->setOpt(CURLOPT_RETURNTRANSFER, true);
         $this->headers = new CaseInsensitiveArray();
@@ -1302,25 +1302,6 @@ private function buildUrl($url, $mixed_data = '')
         return $url . $query_string;
     }
 
-    /**
-     * Create Header Callback
-     *
-     * @access private
-     * @param  $header_callback_data
-     *
-     * @return callable
-     */
-    private function createHeaderCallback($header_callback_data)
-    {
-        return function ($ch, $header) use ($header_callback_data) {
-            if (preg_match('/^Set-Cookie:\s*([^=]+)=([^;]+)/mi', $header, $cookie) === 1) {
-                $header_callback_data->responseCookies[$cookie[1]] = trim($cookie[2], " \n\r\t\0\x0B");
-            }
-            $header_callback_data->rawResponseHeaders .= $header;
-            return strlen($header);
-        };
-    }
-
     /**
      * Download Complete
      *
@@ -1505,3 +1486,24 @@ private function setEncodedCookie($key, $value)
         $this->cookies[implode('', $name_chars)] = implode('', $value_chars);
     }
 }
+
+/**
+ * Create Header Callback
+ *
+ * Gather headers and parse cookies as response headers are received. Keep this function separate from the class so that
+ * unset($curl) automatically calls __destruct() as expected. Otherwise, manually calling $curl->close() will be
+ * necessary to prevent a memory leak.
+ *
+ * @param  $header_callback_data
+ *
+ * @return callable
+ */
+function createHeaderCallback($header_callback_data) {
+    return function ($ch, $header) use ($header_callback_data) {
+        if (preg_match('/^Set-Cookie:\s*([^=]+)=([^;]+)/mi', $header, $cookie) === 1) {
+            $header_callback_data->responseCookies[$cookie[1]] = trim($cookie[2], " \n\r\t\0\x0B");
+        }
+        $header_callback_data->rawResponseHeaders .= $header;
+        return strlen($header);
+    };
+}

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -3026,7 +3026,7 @@ public function testMemoryLeak()
             }
             echo '{"before":' . memory_get_usage() . ',';
             $curl = new Curl();
-            $curl->close();
+            unset($curl);
             echo '"after":' . memory_get_usage() . '}';
             sleep(1);
         }