Timeout if URL checking takes a while

WSJ · Feb 3, 2016 · a68464c · a68464c
1 parent 138db76
commit a68464c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/Readme.md b/Readme.md
@@ -106,6 +106,10 @@ Add a file called *proxy.php* to the config directory. Within the file, use [`st
 
 ## Changelog
 
+### 2.0.1
+
+- Shorter timeout when checking URL validity
+
 ### 2.0.0
 
 - Simplified proxy configuration

diff --git a/api/index.php b/api/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// error_reporting(0);
+error_reporting(0);
 header('Content-Type: application/json');
 
 if (isset($_GET['url']) && $_GET['url'] !== '') {

diff --git a/api/scraper.php b/api/scraper.php
@@ -101,11 +101,18 @@ function checkUrl( $url ) {
            }
            $item_url = $schema[$i]['contents'];
            if (!empty($item_url)) {
-               file_get_contents( $item_url );
-               $headerStatus = checkHeaderStatus($http_response_header, $strict);
-               $schema[$i]['_requestHeader'] = $http_response_header;
-               if ( !is_null($http_response_header) && ($headerStatus === false) ) {
-                   $schema[$i]['ok'] = false;
+               try {
+                   $ctx = stream_context_create(array(
+                       'http' => array('timeout' => 2)
+                   ));
+                   file_get_contents( $item_url );
+                   $headerStatus = checkHeaderStatus($http_response_header, $strict);
+                   $schema[$i]['_requestHeader'] = $http_response_header;
+                   if ( !is_null($http_response_header) && ($headerStatus === false) ) {
+                       $schema[$i]['ok'] = false;
+                   }
+               } catch (Exception $e) {
+
                }
            }
        }

diff --git a/index.html b/index.html
@@ -54,7 +54,7 @@ <h3>{{group}}</h3>
 
             </div>
 
-            <p class="footer"><a  target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> | The Meta Tag Checker. v2.0.0 | <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>
+            <p class="footer"><a  target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> | The Meta Tag Checker. v2.0.1 | <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,7 +54,7 @@ <h3>{{group}}</h3>

		</div>

		<p class="footer"><a target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> \| The Meta Tag Checker. v2.0.0 \| <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>
		<p class="footer"><a target="_self" ng-href="./api/index.php?url={{currentUrl}}">API version of this check</a> \| The Meta Tag Checker. v2.0.1 \| <a href="https://github.com/dowjones/the-meta-tag-checker">View source on Github</a></p>



Expand Down