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

zachborboa · zachborboa · commit 29a1047b01a8 · 2015-04-23T00:05:12.000-07:00
Remove circular reference during cleanup
diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php
@@ -133,6 +133,7 @@ public function close()
         if (is_resource($this->curl)) {
             curl_close($this->curl);
         }
+        $this->options = null;
         $this->json_decoder = null;
     }
 
diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php
@@ -1282,4 +1282,38 @@ public function testRequestMethodSuccessiveOptionsRequests()
         Helper\test($test, 'OPTIONS', 'DELETE');
         Helper\test($test, 'OPTIONS', 'HEAD');
     }
+
+    public function testMemoryLeak()
+    {
+        ob_start();
+        echo '[';
+        for ($i = 0; $i < 10; $i++) {
+            if ($i >= 1) {
+                echo ',';
+            }
+            echo '{"before":' . memory_get_usage() . ',';
+            $curl = new Curl();
+            $curl->close();
+            echo '"after":' . memory_get_usage() . '}';
+            sleep(1);
+        }
+        echo ']';
+        $html = ob_get_contents();
+        ob_end_clean();
+        $results = json_decode($html, true);
+
+        // Ensure memory does not leak excessively after instantiating a new
+        // Curl instance and cleaning up. Memory diffs in the 2000-6000+ range
+        // have indicated a memory leak.
+        $max_memory_diff = 1000;
+        foreach ($results as $i => $result) {
+            $memory_diff = $result['after'] - $result['before'];;
+            echo 'diff:   ' . $memory_diff . "\n";
+
+            // Skip the first test to allow memory usage to settle.
+            if ($i >= 1) {
+                $this->assertLessThan($max_memory_diff, $memory_diff);
+            }
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ public function close()`
`133`	`133`	`if (is_resource($this->curl)) {`
`134`	`134`	`curl_close($this->curl);`
`135`	`135`	`}`
	`136`	`+ $this->options = null;`
`136`	`137`	`$this->json_decoder = null;`
`137`	`138`	`}`
`138`	`139`