* added http_get_request_headers()

* prettify array keys of curl info

diff --git a/http.c b/http.c
index 795a3a54d32387ff1c306a9f587e89dd58035100..21939a062282561497b890a8456f8e2d7bdc7b7f 100644 (file)
--- 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_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)
 #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:
  *
  * <pre>
  * content body. The returned array may look simliar to the following example:
  *
  * <pre>

+ * <?php

  * array(
  *     0 => array(
  *         'Status' => '200 Ok',
  * array(
  *     0 => array(
  *         'Status' => '200 Ok',


@@ -684,6 +686,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
  *     ),
  *     1 => "Hello World!"
  * );

+ * ?>

  * </pre>
  */
 PHP_FUNCTION(http_split_response)
  * </pre>
  */
 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;
 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
 
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 


@@ -767,8 +786,37 @@ PHP_FUNCTION(http_parse_headers)
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
  * </pre>
  *
  * 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:
+ * <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,
+ *     'private' => '',
+ *     'http_connectcode' => 0,
+ *     'httpauth_avail' => 0,
+ *     'proxyauth_avail' => 0,
+ * )
+ * ?>
+ * </pre>

  */
 PHP_FUNCTION(http_get)
 {
  */
 PHP_FUNCTION(http_get)
 {

diff --git a/http_api.c b/http_api.c
index 47d343149e6be903e66e1218b6ed3a14b0fdfcce..7904c5d9271ac295671787dc1fcced2f1b939a52 100644 (file)
--- 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 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)
 /* {{{ 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)
 {
 /* {{{ 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, */
        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 */
 /* }}} 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
 
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 

diff --git a/php_http.h b/php_http.h
index 0b65451b49b2d234e097d060601b34409ed1f21e..1686e46feaf0be740d38caa0c7541d93b76c9f44 100644 (file)
--- 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_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);
 #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 e9c6b3c34f18b09275d7bb8cb3a2024e5e0e1434..9055e6616e4d1f2f40e8f49aa028ab52a42d1aa9 100644 (file)
--- 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_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
 
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL