- reimplement major parts of the request api

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index d9b33d1eac8334ee72e6d63513b32f71367d4ce5..5a2302b5205f890cebdbc212e0517b40c3737a73 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -164,6 +164,8 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                MAKE_STD_ZVAL(len);
                                ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
+                               ZVAL_ADDREF(c);
+                               zend_hash_add(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL);
                                zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
                                zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
                                zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
@@ -227,41 +229,46 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
                        char *decoded = NULL;
                        size_t decoded_len = 0;
-#      if defined(HAVE_ZLIB) && !defined(HTTP_HAVE_ZLIB)
+#      if !defined(HTTP_HAVE_ZLIB)
                        zval func, retval, arg, *args[1];
                        INIT_PZVAL(&func);
                        INIT_PZVAL(&retval);
                        INIT_PZVAL(&arg);
-                       ZVAL_STRINGL(&func, "gzinflate", lenof("gzinflate"), 0);
                        args[0] = &arg;
-#      endif /* HAVE_ZLIB && !HTTP_HAVE_ZLIB */
+#      endif /* !HTTP_HAVE_ZLIB */
 
-#      define DECODE_WITH_EXT_ZLIB() \
+#      define DECODE_WITH_EXT_ZLIB(function, S, L) \
+                               ZVAL_STRINGL(&func, function, lenof(function), 0); \
+                               ZVAL_STRINGL(&arg, (S), (L), 0); \
                                if (SUCCESS == call_user_function(EG(function_table), NULL, &func, &retval, 1, args TSRMLS_CC)) { \
                                        if (Z_TYPE(retval) == IS_STRING) { \
                                                decoded = Z_STRVAL(retval); \
                                                decoded_len = Z_STRLEN(retval); \
                                        } \
                                }
-                       
+
                        if (!strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) {
 #      ifdef HTTP_HAVE_ZLIB
                                http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
 #      else
-                               ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0);
-                               DECODE_WITH_EXT_ZLIB();
+                               DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18);
 #      endif /* HTTP_HAVE_ZLIB */
                        } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
 #      ifdef HTTP_HAVE_ZLIB
                                http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
 #      else
-                               ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0);
-                               DECODE_WITH_EXT_ZLIB();
+                               DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+#      endif /* HTTP_HAVE_ZLIB */
+                       } else if (!strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+#      ifdef HTTP_HAVE_ZLIB
+                               http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+#      else
+                               DECODE_WITH_EXT_ZLIB("gzuncompress", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
 #      endif /* HTTP_HAVE_ZLIB */
                        }
                        
                        if (decoded) {
-                               zval *len;
+                               zval *len, **original_len;
                                char *tmp;
                                int tmp_len;
                                
@@ -269,10 +276,17 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                MAKE_STD_ZVAL(len);
                                ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
+                               ZVAL_ADDREF(c);
+                               zend_hash_add(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
                                zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
-                               zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
-                               zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
-                               
+                               if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void **) &original_len)) {
+                                       ZVAL_ADDREF(*original_len);                                     
+                                       zend_hash_add(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL);
+                                       zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+                               } else {
+                                       zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+                               }
+
                                phpstr_dtor(PHPSTR(msg));
                                PHPSTR(msg)->data = decoded;
                                PHPSTR(msg)->used = decoded_len;
@@ -481,6 +495,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                {
 #ifdef HTTP_HAVE_CURL
                        char *uri = NULL;
+                       http_request request;
                        zval **zhost, options, headers;
 
                        INIT_PZVAL(&options);
@@ -511,21 +526,20 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                                uri = http_absolute_uri(message->http.info.request.URI);
                        }
 
-                       if (!strcasecmp("POST", message->http.info.request.method)) {
+                       if (request.meth = http_request_method_exists(1, 0, message->http.info.request.method)) {
                                http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
-                               rs = http_post(uri, &body, Z_ARRVAL(options), NULL, NULL);
-                       } else
-                       if (!strcasecmp("GET", message->http.info.request.method)) {
-                               rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
-                       } else
-                       if (!strcasecmp("HEAD", message->http.info.request.method)) {
-                               rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
+                               
+                               http_request_init_ex(&request, NULL, request.meth, uri);
+                               request.body = &body;
+                               if (SUCCESS == (rs = http_request_prepare(&request, NULL))) {
+                                       http_request_exec(&request);
+                               }
+                               http_request_dtor(&request);
                        } else {
                                http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
                                        "Cannot send HttpMessage. Request method %s not supported",
                                        message->http.info.request.method);
                        }
-
                        efree(uri);
 #else
                        http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");