php/archived-web-php
1
0
Fork 0
mirror of https://github.com/php/web-php.git synced 2026-03-23 23:02:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added debugging info to fetch_contents(), and enabled track_errors until we require 5.2+ and/or do better error handling. Reveals too much info? Helps deal with bugs like #51679

Browse Source
This commit is contained in:
Philip Olson
2010-05-04 18:08:14 +00:00
parent 0c954878c5
commit efac7dcb5b
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/site.inc
View File

@@ -177,6 +177,8 @@ function header_nocache()
// Compatibility function to fetch data from external source
function fetch_contents($url, $headers = false) {
$terrors_setting = ini_set('track_errors', true);
if(function_exists('file_get_contents') && ini_get('allow_url_fopen')) {
$context = null;
$opts = array('user_agent' => 'php.net');
@@ -198,7 +200,10 @@ function fetch_contents($url, $headers = false) {
}
if (!$data) {
return array("ERROR" => "Unable to find a way to retrieve data with file_get_contents");
return array(
'ERROR_NOTE' => 'Unable to find a way to retrieve data with file_get_contents',
'ERROR_LAST' => $php_errormsg,
);
}
return $data;
@@ -226,7 +231,10 @@ function fetch_contents($url, $headers = false) {
}
}
if (!$data) {
return array("ERROR" => "Unable to find a way to retrieve data with curl");
return array(
'ERROR_NOTE' => 'Unable to find a way to retrieve data with curl',
'ERROR_LAST' => $php_errormsg,
);
}
return $data;
@@ -262,7 +270,10 @@ function fetch_contents($url, $headers = false) {
return $header;
}
if (!$data) {
return array("ERROR" => "Unable to find a way to retrieve data with fsockopen");
return array(
'ERROR_NOTE' => 'Unable to find a way to retrieve data with fsockopen',
'ERROR_LAST' => $php_errormsg,
);
}
return $data;
@@ -270,7 +281,10 @@ function fetch_contents($url, $headers = false) {
// TODO: Log if we get here
// Redirect to www.php.net ?
return array("ERROR" => "Unable to find a way to retrieve data");
return array(
'ERROR_NOTE' => 'Unable to find a way to retrieve data',
'ERROR_LAST' => $php_errormsg,
);
}
// Compatibility function to fetch headers from external source
@@ -281,7 +295,7 @@ function fetch_header($url, $header) {
$headers = get_headers($url, 1);
} else {
$data = fetch_contents($url, true);
if (isset($data["ERROR"])) {
if (isset($data["ERROR_NOTE"])) {
return null;
}
foreach($data as $line) {

3
results.php
View File

@@ -47,7 +47,8 @@ $url = "http://".$srch_host.$srch_rqst;
$data = fetch_contents($url);
if (is_array($data)) {
$comment = '<!-- ' .$data["ERROR"]. '-->';
// FIXME: if (is_authenticated()) ...
$comment = '<!-- ' .print_r($data, true). '-->';
exit_with_pretty_error("Search error", "Internal error", "This mirror does not support searches, please report this error to <a href='/contact'>our webmasters</a>" . $comment);
}
$res = unserialize($data);