merge master in branch

1 files changed, 1 insertions, 19 deletions

diff --git a/inc/io.php b/inc/io.php
index b4da7d635..4bd7c3364 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -474,6 +474,7 @@ function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=20
     $http = new DokuHTTPClient();
     $http->max_bodysize = $maxSize;
     $http->timeout = 25; //max. 25 sec
+    $http->keep_alive = false; // we do single ops here, no need for keep-alive
 
     $data = $http->get($url);
     if(!$data) return false;
@@ -528,25 +529,6 @@ function io_rename($from,$to){
     return true;
 }
 
-
-/**
- * Runs an external command and returns its output as string
- *
- * @author Harry Brueckner <harry_b@eml.cc>
- * @author Andreas Gohr <andi@splitbrain.org>
- * @deprecated
- */
-function io_runcmd($cmd){
-    $fh = popen($cmd, "r");
-    if(!$fh) return false;
-    $ret = '';
-    while (!feof($fh)) {
-        $ret .= fread($fh, 8192);
-    }
-    pclose($fh);
-    return $ret;
-}
-
 /**
  * Runs an external command with input and output pipes.
  * Returns the exit code from the process.