X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=70bf7f0c06385ae58a04ea11f60c72e7d46b6a6f;hp=3853231249f5a4be047f3d4dcaafa9a63b516b4b;hb=ea0d9948275e4e369633c53c59340db3d3df34d3;hpb=6da3520587f9f79c7429501289512d2a2415b517 diff --git a/http_message_object.c b/http_message_object.c index 3853231..70bf7f0 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -393,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); @@ -418,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 @@ -511,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; @@ -531,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 @@ -547,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; @@ -587,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; @@ -595,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; @@ -603,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; @@ -611,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) @@ -803,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); } } /* }}} */ @@ -1135,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; } @@ -1277,6 +1276,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject) zval_ptr_dtor(&array); 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) { @@ -1288,6 +1288,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject) 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 @@ -1399,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"); } } }