X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=70bf7f0c06385ae58a04ea11f60c72e7d46b6a6f;hp=4ad09165de8ea7d0a449e870d963a3887165a2dd;hb=ea0d9948275e4e369633c53c59340db3d3df34d3;hpb=1df42dae0279a4d0f98b042bb389e90cbd197f6f diff --git a/http_message_object.c b/http_message_object.c index 4ad0916..70bf7f0 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -21,6 +21,7 @@ #include "zend_interfaces.h" #include "ext/standard/url.h" +#include "php_variables.h" #include "php_http_api.h" #include "php_http_send_api.h" @@ -118,6 +119,7 @@ HTTP_END_ARGS; HTTP_EMPTY_ARGS(getParentMessage); HTTP_EMPTY_ARGS(send); +HTTP_EMPTY_ARGS(__toString); HTTP_BEGIN_ARGS(toString, 0) HTTP_ARG_VAL(include_parent, 0) HTTP_END_ARGS; @@ -150,7 +152,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va #define http_message_object_get_props _http_message_object_get_props static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); -#define OBJ_PROP_CE http_message_object_ce +#define THIS_CE http_message_object_ce zend_class_entry *http_message_object_ce; zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) @@ -194,7 +196,7 @@ zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(key, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(next, ZEND_ACC_PUBLIC) - ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC) + ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, __toString), ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_MALIAS(HttpMessage, fromString, factory, HTTP_ARGS(HttpMessage, factory), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) @@ -228,20 +230,20 @@ PHP_MINIT_FUNCTION(http_message_object) http_message_object_handlers.get_properties = http_message_object_get_props; http_message_object_handlers.get_property_ptr_ptr = NULL; - DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); - DCL_PROP(PROTECTED, string, body, ""); - DCL_PROP(PROTECTED, string, requestMethod, ""); - DCL_PROP(PROTECTED, string, requestUrl, ""); - DCL_PROP(PROTECTED, string, responseStatus, ""); - DCL_PROP(PROTECTED, long, responseCode, 0); - DCL_PROP_N(PROTECTED, httpVersion); - DCL_PROP_N(PROTECTED, headers); - DCL_PROP_N(PROTECTED, parentMessage); + zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("requestMethod")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("requestUrl")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("responseStatus")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("responseCode")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("httpVersion")-1, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("headers")-1, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("parentMessage")-1, ZEND_ACC_PROTECTED TSRMLS_CC); #ifndef WONKY - DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE); - DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST); - DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_NONE")-1, HTTP_MSG_NONE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_REQUEST")-1, HTTP_MSG_REQUEST TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_RESPONSE")-1, HTTP_MSG_RESPONSE TSRMLS_CC); #endif HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE); @@ -391,6 +393,10 @@ void _http_message_object_free(zend_object *object TSRMLS_DC) { http_message_object *o = (http_message_object *) object; + if (o->iterator) { + zval_ptr_dtor(&o->iterator); + o->iterator = NULL; + } if (o->message) { http_message_dtor(o->message); efree(o->message); @@ -416,7 +422,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type #else zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC); - if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) { + if (!pinfo) { return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC); } #endif @@ -427,8 +433,13 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type } ALLOC_ZVAL(return_value); +#ifdef Z_SET_REFCOUNT + Z_SET_REFCOUNT_P(return_value, 0); + Z_UNSET_ISREF_P(return_value); +#else return_value->refcount = 0; return_value->is_ref = 0; +#endif #ifdef WONKY switch (h) @@ -504,11 +515,8 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; default: -#ifdef WONKY + FREE_ZVAL(return_value); return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC); -#else - RETVAL_NULL(); -#endif } return return_value; @@ -524,14 +532,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va #else zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC); - if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) { + if (!pinfo) { zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC); return; } #endif - cpy = zval_copy(Z_TYPE_P(value), value); - #ifdef WONKY switch (h) #else @@ -540,26 +546,26 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va { case HTTP_MSG_PROPHASH_TYPE: case HTTP_MSG_CHILD_PROPHASH_TYPE: - convert_to_long(cpy); + cpy = http_zsep(IS_LONG, value); http_message_set_type(msg, Z_LVAL_P(cpy)); break; case HTTP_MSG_PROPHASH_HTTP_VERSION: case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION: - convert_to_double(cpy); + cpy = http_zsep(IS_DOUBLE, value); msg->http.version = Z_DVAL_P(cpy); break; case HTTP_MSG_PROPHASH_BODY: case HTTP_MSG_CHILD_PROPHASH_BODY: - convert_to_string(cpy); + cpy = http_zsep(IS_STRING, value); phpstr_dtor(PHPSTR(msg)); phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); break; case HTTP_MSG_PROPHASH_HEADERS: case HTTP_MSG_CHILD_PROPHASH_HEADERS: - convert_to_array(cpy); + cpy = http_zsep(IS_ARRAY, value); zend_hash_clean(&msg->hdrs); zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); break; @@ -580,7 +586,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va case HTTP_MSG_PROPHASH_REQUEST_METHOD: case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD: if (HTTP_MSG_TYPE(REQUEST, msg)) { - convert_to_string(cpy); + cpy = http_zsep(IS_STRING, value); STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; @@ -588,7 +594,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va case HTTP_MSG_PROPHASH_REQUEST_URL: case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL: if (HTTP_MSG_TYPE(REQUEST, msg)) { - convert_to_string(cpy); + cpy = http_zsep(IS_STRING, value); STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; @@ -596,7 +602,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va case HTTP_MSG_PROPHASH_RESPONSE_CODE: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - convert_to_long(cpy); + cpy = http_zsep(IS_LONG, value); msg->http.info.response.code = Z_LVAL_P(cpy); } break; @@ -604,18 +610,18 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va case HTTP_MSG_PROPHASH_RESPONSE_STATUS: case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - convert_to_string(cpy); + cpy = http_zsep(IS_STRING, value); STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); } break; default: -#ifdef WONKY zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC); -#endif break; } - zval_free(&cpy); + if (cpy) { + zval_ptr_dtor(&cpy); + } } static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) @@ -796,7 +802,7 @@ PHP_METHOD(HttpMessage, setBody) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) { phpstr_dtor(PHPSTR(obj->message)); - phpstr_from_string_ex(PHPSTR(obj->message), body, len); + phpstr_from_string_ex(PHPSTR(obj->message), body, len); } } /* }}} */ @@ -1128,9 +1134,9 @@ PHP_METHOD(HttpMessage, setHttpVersion) } convert_to_double(zv); - sprintf(v, "%1.1lf", Z_DVAL_P(zv)); + snprintf(v, sizeof(v), "%1.1f", Z_DVAL_P(zv)); if (strcmp(v, "1.0") && strcmp(v, "1.1")) { - http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %g", Z_DVAL_P(zv)); RETURN_FALSE; } @@ -1235,21 +1241,24 @@ PHP_METHOD(HttpMessage, toMessageTypeObject) #ifdef HTTP_HAVE_CURL int method; char *url; - zval body, *array, *headers, *host = http_message_header(obj->message, "Host"); - php_url hurl, *purl = php_url_parse(obj->message->http.info.request.url); + zval post, body, *array, *headers, *host = http_message_header(obj->message, "Host"); + php_url hurl, *purl = php_url_parse(STR_PTR(obj->message->http.info.request.url)); MAKE_STD_ZVAL(array); array_init(array); memset(&hurl, 0, sizeof(php_url)); - hurl.host = host ? Z_STRVAL_P(host) : NULL; - zval_ptr_dtor(&host); + if (host) { + hurl.host = Z_STRVAL_P(host); + zval_ptr_dtor(&host); + } http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL); php_url_free(purl); add_assoc_string(array, "url", url, 0); - if ( (method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) || - (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method)))) { + if ( obj->message->http.info.request.method && + ((method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) || + (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method))))) { add_assoc_long(array, "method", method); } @@ -1266,9 +1275,22 @@ PHP_METHOD(HttpMessage, toMessageTypeObject) zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setoptions", NULL, array); zval_ptr_dtor(&array); - INIT_PZVAL(&body); - ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0); - zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setrawpostdata", NULL, &body); + if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) { + phpstr_fix(PHPSTR(obj->message)); + INIT_PZVAL(&body); + ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0); + if (method != HTTP_POST) { + zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setbody", NULL, &body); + } else { + INIT_PZVAL(&post); + array_init(&post); + + zval_copy_ctor(&body); + sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC); + zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post); + zval_dtor(&post); + } + } #else http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)"); #endif @@ -1378,8 +1400,8 @@ PHP_METHOD(HttpMessage, unserialize) if ((msg = http_message_parse_ex(obj->message, serialized, (size_t) length))) { obj->message = msg; } else { - http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage"); http_message_init(obj->message); + http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage"); } } } @@ -1479,16 +1501,18 @@ PHP_METHOD(HttpMessage, next) { NO_ARGS { getObject(http_message_object, obj); - getObjectEx(http_message_object, itr, obj->iterator); - - if (itr && itr->parent.handle) { - zval *old = obj->iterator; - MAKE_STD_ZVAL(obj->iterator); - ZVAL_OBJVAL(obj->iterator, itr->parent, 1); - zval_ptr_dtor(&old); - } else { - zval_ptr_dtor(&obj->iterator); - obj->iterator = NULL; + if (obj->iterator) { + getObjectEx(http_message_object, itr, obj->iterator); + + if (itr && itr->parent.handle) { + zval *old = obj->iterator; + MAKE_STD_ZVAL(obj->iterator); + ZVAL_OBJVAL(obj->iterator, itr->parent, 1); + zval_ptr_dtor(&old); + } else { + zval_ptr_dtor(&obj->iterator); + obj->iterator = NULL; + } } } }