diff --git a/simpleid/www/http.inc.php b/simpleid/www/http.inc.php
new file mode 100644
index 0000000..37c1345
--- /dev/null
+++ b/simpleid/www/http.inc.php
@@ -0,0 +1,359 @@
+<?php
+/*
+ * SimpleID
+ *
+ * Copyright (C) Kelvin Mo 2007-9
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 
+ * $Id$
+ */
+ 
+/**
+ * Functions for making and processing HTTP requests.
+ *
+ * @package simpleid
+ * @since 0.7
+ * @filesource
+ */
+
+/**
+ * The user agent to use during HTTP requests.
+ */
+define('SIMPLEHTTP_USER_AGENT', 'SimpleHTTP/' . substr('$Rev$', 6, -2));
+
+/**
+ * Performs an HTTP request.
+ *
+ * Communication with the web server is conducted using libcurl where possible.
+ * Where libcurl does not exist, then sockets will be used.
+ *
+ * Note that the request must be properly prepared before passing onto this function.
+ * For example, for POST requests, the Content-Type and Content-Length headers must be
+ * included in $headers.
+ *
+ * @param string $url the URL
+ * @param array $headers HTTP headers containing name => value pairs
+ * @param string $body the request body
+ * @param string $method the HTTP request method
+ * @param int $retry the maximum number of redirects allowed
+ * @return array containing keys 'error-code' (for communication errors), 'error'
+ * (for communication errors), 'data' (content returned), 'code' (the HTTP status code), 'http-error'
+ * (if the HTTP status code is not 200 or 304), 'protocol' (the HTTP protocol in the response),
+ * 'headers' (an array of return headers in lowercase),
+ * 'content-type' (the HTTP content-type returned)
+ */
+function http_make_request($url, $headers = array(), $body = NULL, $method = 'GET', $retry = 3) {
+    // If CURL is available, we use it
+    if (extension_loaded('curl')) {
+        $response = _http_make_request_curl($url, $headers, $body, $method, $retry);
+    } else {
+        $response = _http_make_request_fsock($url, $headers, $body, $method, $retry);
+    }
+    
+    if (!isset($response['error-code'])) {
+        $valid_codes = array(
+            100, 101,
+            200, 201, 202, 203, 204, 205, 206,
+            300, 301, 302, 303, 304, 305, 307,
+            400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
+            500, 501, 502, 503, 504, 505
+        );
+    
+        // RFC 2616 states that all unknown HTTP codes must be treated the same as the
+        // base code in their class.
+        if (!in_array($response['code'], $valid_codes)) {
+            $response['code'] = floor($response['code'] / 100) * 100;
+        }
+        
+        if (($response['code'] != 200) && ($response['code'] != 304)) {
+            $response['http-error'] = $response['code'];
+        }
+        
+    }
+
+    return $response;
+}
+
+/**
+ * Returns the protocols currently supported for making remote requests.
+ *
+ * If libcurl is used, this function returns a list of protocols supported by the
+ * included build of the library.  If libcurl is not used, then HTTP is the
+ * only protocol supported.
+ *
+ * @return array an array of protocols
+ */
+function http_protocols() {
+    if (extension_loaded('curl')) {
+        $curl_version = curl_version();
+        return $curl_version['protocols'];
+    } else {
+        return array('http');
+    }
+}
+
+/**
+ * Performs an HTTP request using libcurl.
+ *
+ * @param string $url the URL
+ * @param array $headers HTTP headers containing name => value pairs
+ * @param string $body the request body
+ * @param string $method the HTTP request method
+ * @param int $retry the maximum number of redirects allowed
+ * @return array containing keys 'error-code' (for communication errors), 'error'
+ * (for communication errors), 'data' (content returned), 'code' (the HTTP status code), 'http-error'
+ * (if the HTTP status code is not 200 or 304), 'headers' (an array of return headers),
+ * 'content-type' (the HTTP content-type returned)
+ */
+function _http_make_request_curl($url, $headers = array(), $body = NULL, $method = 'GET', $retry = 3) {
+    // CURLOPT_FOLLOWLOCATION only works when safe mode is off or when open_basedir is set
+    // In these instances we will need to follow redirects manually
+    $manual_redirect = ((@ini_get('safe_mode') === 1)   // safe mode
+        || (strtolower(@ini_get('safe_mode')) == 'on')  // safe mode
+        || (@ini_get('open_basedir') != false)); // open_basedir
+    
+    $version = curl_version();
+    
+    $curl = curl_init($url);
+    
+    if (version_compare($version['version'], '7.10.5', '>=')) {
+        curl_setopt($curl, CURLOPT_ENCODING, '');
+    }
+    
+    if (!$manual_redirect) curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+    
+    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
+    curl_setopt($curl, CURLOPT_MAXREDIRS, $retry);
+    curl_setopt($curl, CURLOPT_HTTPHEADER, array(implode("\n", $headers) . "\n"));
+    curl_setopt($curl, CURLOPT_USERAGENT, SIMPLEHTTP_USER_AGENT);
+    
+    curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+    curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 20);
+    
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($curl, CURLOPT_HEADER, true);
+    
+    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+    
+    if ($body != NULL) curl_setopt($curl, CURLOPT_POSTFIELDS, $body);
+    
+    $response = curl_exec($curl);
+    
+    if (($response === FALSE) && ((curl_errno($curl) == 23) || (curl_errno($curl) == 61))) {
+        curl_setopt($curl, CURLOPT_ENCODING, 'none');
+        $response = curl_exec($curl);
+    }
+    
+    if ($response === FALSE) {
+        $result = array();
+        $result['error-code'] = curl_errno($curl);
+        $result['error'] = curl_error($curl);
+    } else {
+        $result['code'] = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $result['url'] = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
+        $result['content-type'] = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        
+        // Parse response.
+        $result['raw'] = $response;
+        
+        $header_size = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+        $result['data'] = substr($response, $header_size);
+        
+        $response_headers = substr($response, 0, $header_size - 4);
+
+        // In case where redirect occurs, we want the last set of headers
+        $header_blocks = explode("\r\n\r\n", $response_headers);
+        $header_block = array_pop($header_blocks);
+
+        $result = array_merge($result, _http_parse_headers($header_block, TRUE));
+        
+        // If we are in safe mode, we need to process redirects manually
+        if ($manual_redirect && (($result['code'] == 301) || ($result['code'] == 302) || ($result['code'] == 307))) {
+            if ($retry == 0) {
+                // Too many times, return an error
+                $result['error-code'] = 47;
+                $result['error'] = 'Too many redirects';
+            } else {
+                curl_close($curl);
+                return _http_make_request_curl($result['headers']['location'], $headers, $body, $method, $retry - 1);
+            }
+        }
+    }
+    
+    curl_close($curl);
+
+    return $result;
+}
+
+/**
+ * Performs an HTTP request using sockets.
+ *
+ * @param string $url the URL
+ * @param array $headers HTTP headers containing name => value pairs
+ * @param string $body the request body
+ * @param string $method the HTTP request method
+ * @param int $retry the maximum number of redirects allowed
+ * @return array containing keys 'error-code' (for communication errors), 'error'
+ * (for communication errors), 'data' (content returned), 'code' (the HTTP status code), 'http-error'
+ * (if the HTTP status code is not 200 or 304), 'headers' (an array of return headers),
+ * 'content-type' (the HTTP content-type returned)
+ */
+function _http_make_request_fsock($url, $headers = array(), $body = NULL, $method = 'GET', $retry = 3) {
+    $result = array();
+    
+    $parts = parse_url($url);
+    
+    if (!isset($parts)) {
+        $result['error-code'] = 3;
+        $result['error'] = 'URL not properly formatted';
+        return $result;
+    }
+    
+    if ($parts['scheme'] == 'http') {
+        $port = isset($parts['port']) ? $parts['port'] : 80;
+        $host = $parts['host'];
+    } elseif ($parts['scheme'] == 'https') {
+        $port = isset($parts['port']) ? $parts['port'] : 443;
+        $host = 'ssl://' . $parts['host'];
+    } else {
+        $result['error-code'] = 1;
+        $result['error'] = 'Unsupported protocol';
+    }
+    
+    $fp = @fsockopen($host, $port, $errno, $errstr, 15);
+
+    if (!$fp) {
+        $result['error-code'] = 7;
+        $result['error'] = "Cannot connect: Error $errno:" . trim($errstr);
+        return $result;
+    }
+    
+    if (isset($parts['path'])) {
+        $path = $url_parts['path'];
+        if (isset($parts['query'])) $path .= '?' . $url_parts['query'];
+    } else {
+        $path = '/';
+    }
+
+    $headers = array_merge(
+        array(
+            'Host' => $parts['host'],
+            'User-Agent' => SIMPLEHTTP_USER_AGENT,
+            'Connection' => 'close'
+        ),
+        $headers
+    );
+
+    if (isset($parts['user']) && isset($parts['pass'])) {
+        $headers['Authorization'] = 'Basic '. base64_encode($parts['user'] . (!empty($parts['pass']) ? ":". $parts['pass'] : ''));
+    }
+    
+    $request = $method . ' '. $path ." HTTP/1.0\r\n";
+    
+    $keys = array_keys($headers);
+    for ($i = 0; $i < count($keys); $i++) {
+        $request .= $keys[$i] . ': ' . $headers[$keys[$i]] . "\r\n";
+    }
+    
+    // End of headers - separator
+    $request .= "\r\n";
+    
+    if ($body != NULL) $request .= $body;
+    
+    fwrite($fp, $request);
+
+    // Fetch response.
+    $response = '';
+    while (!feof($fp) && $chunk = fread($fp, 1024)) {
+        $response .= $chunk;
+    }
+    fclose($fp);
+
+    // Parse response.
+    list($header_block, $result['data']) = explode("\r\n\r\n", $response, 2);
+    
+    $result = array_merge($result, _http_parse_headers($header_block, FALSE));
+    
+    // Process redirects
+    if (($result['code'] == 301) || ($result['code'] == 302) || ($result['code'] == 307)) {
+        if ($retry == 0) {
+            // Too many times, return an error
+            $result['error-code'] = 47;
+            $result['error'] = 'Too many redirects';
+        } else {
+            $result = _http_make_request_fsock($result['headers']['location'], $headers, $body, $method, $retry - 1);
+        }
+    }
+
+    $result['url'] = $url;
+    return $result;
+}
+
+/**
+ * Parses HTTP response headers.
+ *
+ * @param string $header_block the unparsed header block
+ * @param bool $curl if true, use simplified parsing as libcurl already parses
+ * the headers
+ * @return an array containing the following keys: 'protocol' (the HTTP protocol in the response),
+ * 'headers' (an array of return headers in lowercase).  If $curl is false, additional
+ * parsing is done for 'code' and 'content-type'
+ */
+function _http_parse_headers($header_block, $curl) {
+    $headers = array();
+    $result = array();
+    
+    // Split the status line from the rest of the message header
+    list($status, $header_block) = preg_split("/\r\n|\n|\r/", $header_block, 2);
+    
+    // RFC 2616, section 4.2: Header fields can be extended over multiple lines
+    // by preceding each extra line with at least one space or tab.  So we need
+    // to join them...
+    $header_block = preg_replace('/(\r\n|\n|\r)( |\t)+/', '', $header_block);
+    
+    // Then split them to get the fields
+    $fields = preg_split("/\r\n|\n|\r/", $header_block);
+    
+    // Parse the status line
+    list($protocol, $code, $reason) = explode(' ', trim($status), 3);
+    
+    $result['protocol'] = $protocol;    
+    if (!$curl) $result['code'] = $code;
+
+    // Parse headers.
+    while ($field = trim(array_shift($fields))) {
+        list($header, $value) = explode(':', $field, 2);
+        
+        // Headers are case insensitive
+        $header = strtolower($header);
+        
+        if (isset($headers[$header])) {
+            // RFC 2616, section 4.2: Multiple headers with the same field
+            // name is the same as a concatenating all the headers in a single
+            // header, separated by commas.
+            $headers[$header] .= ','. trim($value);
+        } else {
+            $headers[$header] = trim($value);
+        }
+        
+        if (!$curl && (strtolower($header) == 'content-type')) $result['content-type'] = $value;
+    }
+        
+    $result['headers'] = $headers;
+    return $result;
+}
+?>