From 711cec2bc92f1c844b476b80194ae2b09e5dbea0 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 14 Feb 2006 14:24:17 +0000
Subject: [PATCH] - cosmetics

---
 http_functions.c   | 63 ++++++++++++++++++++++++++++------------------
 http_request_api.c |  4 +--
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/http_functions.c b/http_functions.c
index b16cef1..8a5e49e 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -1278,30 +1278,45 @@ PHP_FUNCTION(http_match_request_header)
  * <pre>
  * <?php
  * array (
- *     'effective_url' => 'http://localhost',
- *     'response_code' => 403,
- *     'total_time' => 0.017,
- *     'namelookup_time' => 0.013,
- *     'connect_time' => 0.014,
- *     'pretransfer_time' => 0.014,
- *     'size_upload' => 0,
- *     'size_download' => 202,
- *     'speed_download' => 11882,
- *     'speed_upload' => 0,
- *     'header_size' => 145,
- *     'request_size' => 62,
- *     'ssl_verifyresult' => 0,
- *     'filetime' => -1,
- *     'content_length_download' => 202,
- *     'content_length_upload' => 0,
- *     'starttransfer_time' => 0.017,
- *     'content_type' => 'text/html; charset=iso-8859-1',
- *     'redirect_time' => 0,
- *     'redirect_count' => 0,
- *     'http_connectcode' => 0,
- *     'httpauth_avail' => 0,
- *     'proxyauth_avail' => 0,
- * )
+ *    'effective_url' => 'http://www.example.com/',
+ *    'response_code' => 302,
+ *    'connect_code' => 0,
+ *    'filetime' => -1,
+ *    'total_time' => 0.212348,
+ *    'namelookup_time' => 0.038296,
+ *    'connect_time' => 0.104144,
+ *    'pretransfer_time' => 0.104307,
+ *    'starttransfer_time' => 0.212077,
+ *    'redirect_time' => 0,
+ *    'redirect_count' => 0,
+ *    'size_upload' => 0,
+ *    'size_download' => 218,
+ *    'speed_download' => 1026,
+ *    'speed_upload' => 0,
+ *    'header_size' => 307,
+ *    'request_size' => 103,
+ *    'ssl_verifyresult' => 0,
+ *    'ssl_engines' =>
+ *    array (
+ *      0 => 'dynamic',
+ *      1 => 'cswift',
+ *      2 => 'chil',
+ *      3 => 'atalla',
+ *      4 => 'nuron',
+ *      5 => 'ubsec',
+ *      6 => 'aep',
+ *      7 => 'sureware',
+ *      8 => '4758cca',
+ *    ),
+ *    'content_length_download' => 218,
+ *    'content_length_upload' => 0,
+ *    'content_type' => 'text/html',
+ *    'httpauth_avail' => 0,
+ *    'proxyauth_avail' => 0,
+ *    'num_connects' => 1,
+ *    'os_errno' => 0,
+ *    'error' => '',
+ *  )
  * ?>
  * </pre>
  * 
diff --git a/http_request_api.c b/http_request_api.c
index d07305e..613c32a 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -872,12 +872,12 @@ PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info)
 	HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE);
 	HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL);
 	HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL);
-	HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
-	add_assoc_string(&array, "error", request->_error, 1);
 	HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS);
 #if LIBCURL_VERSION_NUM >= 0x070e01
 	HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");
 #endif
+	HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
+	add_assoc_string(&array, "error", request->_error, 1);
 }
 /* }}} */
 
-- 
2.30.2