From: Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
Date: Tue, 24 Sep 2013 09:02:33 +0000 (-0700)
Subject: Merge pull request #126 from Alkarex/Milliseconds
X-Git-Tag: v0.0.42beta~20
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fdc3c114d1617578e388147af138e8470d7b20b3;hp=fc93ae1d1a661ff33d1f1ed1100ae09277a77456;p=github%2Fshaarli%2FShaarli.git

Merge pull request #126 from Alkarex/Milliseconds

Import: add compatibility for milliseconds in NETSCAPE-Bookmark
---

diff --git a/index.php b/index.php
index b65bfb7c..b402eba9 100644
--- a/index.php
+++ b/index.php
@@ -566,7 +566,7 @@ function getHTTP($url,$timeout=30)
 {
     try
     {
-        $options = array('http'=>array('method'=>'GET','timeout' => $timeout)); // Force network timeout
+        $options = array('http'=>array('method'=>'GET','timeout' => $timeout, 'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0')); // Force network timeout
         $context = stream_context_create($options);
         $data=file_get_contents($url,false,$context,-1, 4000000); // We download at most 4 Mb from source.
         if (!$data) { return array('HTTP Error',array(),''); }
@@ -2444,4 +2444,4 @@ if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=d
 if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'ws=')) { processWS(); exit; } // Webservices (for jQuery/jQueryUI)
 if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE'];
 renderPage();
-?>
\ No newline at end of file
+?>