- fix refelction info for some methods of HttpRequest

- added HttpRequest::getRequestMessage() returning the outgoing request message(s)
- added HttpRequest::debugWrapper() actually fetching the request message(s)

diff --git a/http_request_api.c b/http_request_api.c
index b8173bc5ef7060190b1c3aed794393ba1c837ab3..b3f7150e62fa240a74aed4ad122afb22e8662b20 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -25,6 +25,9 @@
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
+#ifdef ZEND_ENGINE_2
+#      include "php_http_request_object.h"
+#endif
 
 #include "phpstr/phpstr.h"
 
@@ -934,6 +937,7 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 }
 /* }}} */
 
+/* {{{ static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *) */
 static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
 {
        zval *params_pass[2], params_local[2], retval;
@@ -942,15 +946,28 @@ static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string,
        params_pass[0] = &params_local[0];
        params_pass[1] = &params_local[1];
 
+       INIT_PZVAL(&retval);
        INIT_PZVAL(params_pass[0]);
        INIT_PZVAL(params_pass[1]);
        ZVAL_LONG(params_pass[0], type);
        ZVAL_STRINGL(params_pass[1], string, length, 0);
 
-       call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+#ifdef ZEND_ENGINE_2
+       /* ensure we can call private HttpRequest::debugWrapper() */
+       {
+               void *sc = EG(scope);
+               EG(scope) = http_request_object_ce;
+#endif
+               call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+#ifdef ZEND_ENGINE_2
+               EG(scope) = sc;
+       }
+#endif
 
        return 0;
 }
+/* }}} */
+
 /* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */
 static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
 {

diff --git a/http_request_object.c b/http_request_object.c
index 534b09942bec8c397365d3d54a08c50996ee137b..9bcac0271098ec7e72b388c2970e1cb2cc1e312c 100644 (file)
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -143,64 +143,70 @@ HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseMessage, 1);
+HTTP_EMPTY_ARGS(getRequestMessage, 1);
 HTTP_EMPTY_ARGS(send, 0);
 
-HTTP_BEGIN_ARGS(get, 1, 0)
+HTTP_BEGIN_ARGS(get, 0, 1)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(head, 1, 0)
+HTTP_BEGIN_ARGS(head, 0, 1)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(postData, 2, 0)
+HTTP_BEGIN_ARGS(postData, 0, 2)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(data, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(postFields, 2, 0)
+HTTP_BEGIN_ARGS(postFields, 0, 2)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(data, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(putFile, 2, 0)
+HTTP_BEGIN_ARGS(putFile, 0, 2)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(file, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(putStream, 2, 0)
+HTTP_BEGIN_ARGS(putStream, 0, 2)
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(stream, 0)
        HTTP_ARG_VAL(options, 0)
        HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodRegister, 1, 0)
+HTTP_BEGIN_ARGS(methodRegister, 0, 1)
        HTTP_ARG_VAL(method_name, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodUnregister, 1, 0)
+HTTP_BEGIN_ARGS(methodUnregister, 0, 1)
        HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodName, 1, 0)
+HTTP_BEGIN_ARGS(methodName, 0, 1)
        HTTP_ARG_VAL(method_id, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodExists, 1, 0)
+HTTP_BEGIN_ARGS(methodExists, 0, 1)
        HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(debugWrapper, 0, 2)
+       HTTP_ARG_VAL(info_type, 0)
+       HTTP_ARG_VAL(info_message, 0)
+HTTP_END_ARGS;
+
 #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C)
 static inline void _http_request_object_declare_default_properties(TSRMLS_D);
 
@@ -260,6 +266,7 @@ zend_function_entry http_request_object_fe[] = {
        HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC)
        HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
        HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC)
 
        HTTP_REQUEST_ALIAS(get, http_get)
        HTTP_REQUEST_ALIAS(head, http_head)
@@ -273,6 +280,8 @@ zend_function_entry http_request_object_fe[] = {
        HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
        HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
 
+       HTTP_REQUEST_ME(debugWrapper, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
+
        {NULL, NULL, NULL}
 };
 static zend_object_handlers http_request_object_handlers;
@@ -331,6 +340,7 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
        o->ch = curl_easy_init();
        o->pool = NULL;
 
+       phpstr_init(&o->request);
        phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
 
        ALLOC_HASHTABLE(OBJ_PROP(o));
@@ -361,6 +371,8 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D)
        DCL_PROP(PROTECTED, string, contentType, "");
        DCL_PROP(PROTECTED, string, queryData, "");
        DCL_PROP(PROTECTED, string, putFile, "");
+
+       DCL_PROP_N(PRIVATE, dbg_user_cb);
 }
 
 void _http_request_object_free(zend_object *object TSRMLS_DC)
@@ -372,9 +384,13 @@ void _http_request_object_free(zend_object *object TSRMLS_DC)
                FREE_HASHTABLE(OBJ_PROP(o));
        }
        if (o->ch) {
+               /* avoid nasty segfaults with already cleaned up callbacks */
+               curl_easy_setopt(o->ch, CURLOPT_NOPROGRESS, 1);
+               curl_easy_setopt(o->ch, CURLOPT_VERBOSE, 0);
                curl_easy_cleanup(o->ch);
        }
        phpstr_dtor(&o->response);
+       phpstr_dtor(&o->request);
        efree(o);
 }
 
@@ -411,6 +427,16 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
                strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
        }
 
+       /* ensure we have HttpRequest::debugWrapper as dbg callback */
+       {
+               zval *dbg_cb;
+               MAKE_STD_ZVAL(dbg_cb);
+               array_init(dbg_cb);
+               add_next_index_zval(dbg_cb, getThis());
+               add_next_index_stringl(dbg_cb, "debugWrapper", lenof("debugWrapper"), 1);
+               add_assoc_zval(opts, "ondebug", dbg_cb);
+       }
+
        switch (Z_LVAL_P(meth))
        {
                case HTTP_GET:
@@ -463,6 +489,8 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 
        /* clean previous response */
        phpstr_dtor(&obj->response);
+       /* clean previous request */
+       phpstr_dtor(&obj->request);
 
        efree(request_uri);
        return status;
@@ -472,6 +500,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 {
        http_message *msg;
 
+       phpstr_fix(&obj->request);
        phpstr_fix(&obj->response);
 
        if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
@@ -580,17 +609,19 @@ PHP_METHOD(HttpRequest, setOptions)
                                zval **headers;
                                if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
                                        array_merge(*opt, *headers);
-                                       continue;
                                }
                        } else if (!strcmp(key, "cookies")) {
                                zval **cookies;
                                if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
                                        array_merge(*opt, *cookies);
-                                       continue;
                                }
+                       } else {
+                               if (!strcmp(key, "ondebug")) {
+                                       SET_PROP(obj, dbg_user_cb, *opt);
+                               }
+                               zval_add_ref(opt);
+                               add_assoc_zval(old_opts, key, *opt);
                        }
-                       zval_add_ref(opt);
-                       add_assoc_zval(old_opts, key, *opt);
 
                        /* reset */
                        key = NULL;
@@ -1498,12 +1529,36 @@ PHP_METHOD(HttpRequest, getResponseMessage)
                zval *message;
                getObject(http_request_object, obj);
 
+               SET_EH_THROW_HTTP();
                message = GET_PROP(obj, responseMessage);
                if (Z_TYPE_P(message) == IS_OBJECT) {
                        RETVAL_OBJECT(message);
                } else {
-                       RETURN_NULL();
+                       RETVAL_NULL();
                }
+               SET_EH_NORMAL();
+       }
+}
+/* }}} */
+
+/* {{{ proto HttpMessage HttpRequest::getRequestMessage()
+ *
+ * Get sent HTTP message.
+ */
+PHP_METHOD(HttpRequest, getRequestMessage)
+{
+       NO_ARGS;
+
+       IF_RETVAL_USED {
+               zval *message;
+               http_message *msg;
+               getObject(http_request_object, obj);
+
+               SET_EH_THROW_HTTP();
+               if (msg = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request))) {
+                       RETVAL_OBJVAL(http_message_object_from_msg(msg));
+               }
+               SET_EH_NORMAL();
        }
 }
 /* }}} */
@@ -1573,6 +1628,41 @@ PHP_METHOD(HttpRequest, send)
 }
 /* }}} */
 
+/* {{{ proto private HttpRequest::debugWrapper(long type, string message)
+ */
+PHP_METHOD(HttpRequest, debugWrapper)
+{
+       getObject(http_request_object, obj);
+       zval *type, *message, *dbg_user_cb = GET_PROP(obj, dbg_user_cb);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &type, &message)) {
+               RETURN_NULL();
+       }
+       if (Z_TYPE_P(type) != IS_LONG) {
+               convert_to_long_ex(&type);
+       }
+       if (Z_TYPE_P(message) != IS_STRING) {
+               convert_to_string_ex(&message);
+       }
+
+       /* fetch outgoing request message */
+       if (Z_LVAL_P(type) == CURLINFO_HEADER_OUT || Z_LVAL_P(type) == CURLINFO_DATA_OUT) {
+               phpstr_append(&obj->request, Z_STRVAL_P(message), Z_STRLEN_P(message));
+       }
+
+       /* call user debug callback */
+       if (Z_TYPE_P(dbg_user_cb) != IS_NULL) {
+               zval *args[2], cb_ret;
+
+               args[0] = type;
+               args[1] = message;
+               call_user_function(EG(function_table), NULL, dbg_user_cb, &cb_ret, 2, args TSRMLS_CC);
+       }
+
+       RETURN_NULL();
+}
+/* }}} */
+
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 /*

diff --git a/php_http_request_object.h b/php_http_request_object.h
index 5414fa5d70ccd2ddfd9b11ed7501dbce0ec8155a..e7b89ab2ae17ccdb3c8c3b9e60cde95248a07798 100644 (file)
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -35,6 +35,7 @@ typedef struct {
        CURL *ch;
        http_request_pool *pool;
        phpstr response;
+       phpstr request;
 } http_request_object;
 
 extern zend_class_entry *http_request_object_ce;
@@ -95,6 +96,7 @@ PHP_METHOD(HttpRequest, getResponseCode);
 PHP_METHOD(HttpRequest, getResponseBody);
 PHP_METHOD(HttpRequest, getResponseInfo);
 PHP_METHOD(HttpRequest, getResponseMessage);
+PHP_METHOD(HttpRequest, getRequestMessage);
 
 PHP_METHOD(HttpRequest, get);
 PHP_METHOD(HttpRequest, head);
@@ -108,6 +110,8 @@ PHP_METHOD(HttpRequest, methodUnregister);
 PHP_METHOD(HttpRequest, methodName);
 PHP_METHOD(HttpRequest, methodExists);
 
+PHP_METHOD(HttpRequest, debugWrapper);
+
 #endif
 #endif
 #endif