Revert march tweaks to FetchUrl, a=chris

Chris Pollett [2015-12-15 19:Dec:th]
Revert march tweaks to FetchUrl, a=chris
Filename
src/library/FetchUrl.php
src/models/LocaleModel.php
diff --git a/src/library/FetchUrl.php b/src/library/FetchUrl.php
index 5ba8b5ce1..ce7780cc4 100755
--- a/src/library/FetchUrl.php
+++ b/src/library/FetchUrl.php
@@ -210,7 +210,7 @@ class FetchUrl implements CrawlConstants
         //Process returned pages
         for ($i = 0; $i < $num_sites; $i++) {
             if ($timer) {
-                crawlTimeoutLog("fetch_url initial processing of page %s of %s",
+                crawlTimeoutLog("FetchUrl initial processing of page %s of %s",
                     $i, $num_sites);
             }
             if (!$minimal && isset($ip_holder[$i]) ) {
@@ -313,7 +313,12 @@ class FetchUrl implements CrawlConstants
                             strtolower(trim($type_parts[0]));
                     }
                 }
-                curl_multi_remove_handle($agent_handler, $sites[$i][0]);
+                /*
+                   Ideally should have line:
+                   curl_multi_remove_handle($agent_handler, $sites[$i][0]);
+                   However, this seems to cause curl to sometimes crash
+                   with by trying to free stuff twice on some linux systems
+                 */
                 curl_close($sites[$i][0]);
                 if (isset($sites[$i]['ROBOT']) && $sites[$i]['ROBOT']) {
                     if (isset($sites[$i][self::TYPE]) &&
diff --git a/src/models/LocaleModel.php b/src/models/LocaleModel.php
index 7afb1f89e..14cac53b3 100755
--- a/src/models/LocaleModel.php
+++ b/src/models/LocaleModel.php
@@ -759,7 +759,7 @@ EOT;
         }
         $out = implode("\n", $n);
         $out .= "\n";
-        file_put_contents($cur_path.'/configure.ini', $out);
+        file_put_contents($cur_path . '/configure.ini', $out);
     }
     /**
      * Computes a string of the form string_id = 'translation' for a string_id
ViewGit