From 8d7fee64c740137b693630ad82374c11d1aaa76a Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 11 Feb 2005 14:42:09 +0000 Subject: [PATCH] * added http_get_request_headers() * prettify array keys of curl info --- http.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++--- http_api.c | 45 ++++++++++++++++++++++++++++++++++++++++- php_http.h | 1 + php_http_api.h | 3 +++ 4 files changed, 99 insertions(+), 4 deletions(-) diff --git a/http.c b/http.c index 795a3a5..21939a0 100644 --- a/http.c +++ b/http.c @@ -94,6 +94,7 @@ function_entry http_functions[] = { PHP_FE(http_chunked_decode, NULL) PHP_FE(http_split_response, NULL) PHP_FE(http_parse_headers, NULL) + PHP_FE(http_get_request_headers, NULL) #ifdef HTTP_HAVE_CURL PHP_FE(http_get, http_request_info_ref_3) PHP_FE(http_head, http_request_info_ref_3) @@ -676,6 +677,7 @@ PHP_FUNCTION(http_chunked_decode) * content body. The returned array may look simliar to the following example: * * 
+ *  array(
  *         'Status' => '200 Ok',
@@ -684,6 +686,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  *
*/ PHP_FUNCTION(http_split_response) @@ -711,7 +714,9 @@ PHP_FUNCTION(http_split_response) } /* }}} */ -/* {{{ proto array http_parse_headers(string header) */ +/* {{{ proto array http_parse_headers(string header) + * + */ PHP_FUNCTION(http_parse_headers) { char *header, *rnrn; @@ -734,6 +739,20 @@ PHP_FUNCTION(http_parse_headers) } /* }}}*/ +/* {{{ proto array http_get_request_headers(void) + * + */ +PHP_FUNCTION(http_get_request_headers) +{ + if (ZEND_NUM_ARGS()) { + WRONG_PARAM_COUNT; + } + + array_init(return_value); + http_get_request_headers(return_value); +} +/* }}} */ + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL @@ -767,8 +786,37 @@ PHP_FUNCTION(http_parse_headers) * * * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied (don't forget to initialize it - * with NULL or array()). + * in form af an associative array, if supplied, like the following example: + * 
+ *  '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,
+ *     'private' => '',
+ *     'http_connectcode' => 0,
+ *     'httpauth_avail' => 0,
+ *     'proxyauth_avail' => 0,
+ * )
+ * ?>
+ *
*/ PHP_FUNCTION(http_get) { diff --git a/http_api.c b/http_api.c index 47d3431..7904c5d 100644 --- a/http_api.c +++ b/http_api.c @@ -144,6 +144,8 @@ static int check_day(char *day, size_t len); static int check_month(char *month); static int check_tzone(char *tzone); +static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen); + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC) @@ -606,7 +608,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* {{{ static inline char *http_curl_getinfoname(CURLINFO) */ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC) { -#define CASE(I) case CURLINFO_ ##I : return #I +#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0) switch (i) { /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ @@ -811,6 +813,30 @@ static int check_tzone(char *tzone) } /* }}} */ +/* static char *pretty_key(char *, int, int, int) */ +static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen) +{ + if (key && key_len) { + int i, wasalpha; + if (wasalpha = isalpha(key[0])) { + key[0] = uctitle ? toupper(key[0]) : tolower(key[0]); + } + for (i = 1; i < key_len; i++) { + if (isalpha(key[i])) { + key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]); + wasalpha = 1; + } else { + if (xhyphen && (key[i] == '_')) { + key[i] = '-'; + } + wasalpha = 0; + } + } + } + return key; +} +/* }}} */ + /* }}} internals */ /* {{{ public API */ @@ -1783,6 +1809,23 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra } /* }}} */ +/* {{{ void http_get_request_headers(zval *) */ +PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC) +{ + char *key; + + for ( zend_hash_internal_pointer_reset(HTTP_SERVER_VARS); + zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT; + zend_hash_move_forward(HTTP_SERVER_VARS)) { + if (!strncmp(key, "HTTP_", 5)) { + zval **header; + zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header); + add_assoc_stringl(array, pretty_key(key + 5, strlen(key) - 5, 1, 1), Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); + } + } +} +/* }}} */ + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL diff --git a/php_http.h b/php_http.h index 0b65451..1686e46 100644 --- a/php_http.h +++ b/php_http.h @@ -57,6 +57,7 @@ PHP_FUNCTION(http_send_stream); PHP_FUNCTION(http_chunked_decode); PHP_FUNCTION(http_split_response); PHP_FUNCTION(http_parse_headers); +PHP_FUNCTION(http_get_request_headers); #ifdef HTTP_HAVE_CURL PHP_FUNCTION(http_get); PHP_FUNCTION(http_head); diff --git a/php_http_api.h b/php_http_api.h index e9c6b3c..9055e66 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -158,6 +158,9 @@ PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, #define http_parse_headers(h, l, a) _http_parse_headers((h), (l), (a) TSRMLS_CC) PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC); +#define http_get_request_headers(h) _http_get_request_headers((h) TSRMLS_CC) +PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC); + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL -- 2.30.2