[Mapbender-commits] r9169 - trunk/mapbender/http/classes
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Mar 10 08:57:57 PDT 2015
Author: syed
Date: 2015-03-10 08:57:57 -0700 (Tue, 10 Mar 2015)
New Revision: 9169
Modified:
trunk/mapbender/http/classes/class_connector.php
Log:
fix class_connector
Modified: trunk/mapbender/http/classes/class_connector.php
===================================================================
--- trunk/mapbender/http/classes/class_connector.php 2015-03-10 14:55:16 UTC (rev 9168)
+++ trunk/mapbender/http/classes/class_connector.php 2015-03-10 15:57:57 UTC (rev 9169)
@@ -71,7 +71,7 @@
$posPROXY = strpos($url,OWSPROXY);
//$e = new mb_exception('class_connector: old url: '.$url);
if($posPROXY !== false && OWSPROXY_USE_LOCALHOST == true){
- var_dump('test1');die;
+
$e = new mb_notice('class_connector: old url: '.$url);
$url = str_replace($_SERVER['HTTP_HOST'], "127.0.0.1", $url);
$url = str_replace("https", "http", $url);//localhost no https should needed - it will be faster without
@@ -80,13 +80,13 @@
$e = new mb_notice('class_connector: load url: '.$url);
if (!$url) {
- var_dump('test2');die;
+
$e = new mb_exception("connector: no URL given");
return false;
}
switch ($this->connectionType) {
case "curl":
- var_dump('test3');die;
+
if (func_num_args() == 2) {
$auth = func_get_arg(1);
if (isset($auth)) {
@@ -95,25 +95,23 @@
}
}
else {
- var_dump('test4');die;
+
$e = new mb_notice("connector: curl without auth");
$this->file = $this->getCURL($url);
}
break;
case "http":
- // var_dump('test5');
+
$e = new mb_notice("connector: http");
$this->file = $this->getHTTP($url);
- // var_dump($this->getHTTP($url));
break;
case "socket":
- var_dump('test6');die;
+
$e = new mb_notice("connector: socket");
$this->file = $this->getSOCKET($url);
break;
}
if(!$this->file){
- // var_dump('test7');die;
$e = new mb_exception("connector: unable to load: ".$url);
return false;
}
@@ -361,7 +359,6 @@
}
private function getHTTP($url){
- // var_dump(file_get_contents($url));die;
if ($this->httpType == "get") {
return @file_get_contents($url);
}
More information about the Mapbender_commits
mailing list