X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=cd64d31a4f0bd87f788b5087736f56a6f559ef10;hp=8cf6969a885bf9003f610353baa1b764df852a60;hb=bb1f32fd5d06b9b9ace6517c177b0fe58c9ff57c;hpb=19cad54672b6babfac2b7c9c64c415c9a24b888a diff --git a/http_message_object.c b/http_message_object.c index 8cf6969..cd64d31 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -30,6 +30,9 @@ #include "php_http_exception_object.h" #include "phpstr/phpstr.h" +#include "missing.h" + +ZEND_EXTERN_MODULE_GLOBALS(http); #define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, ret_ref, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref) @@ -44,6 +47,10 @@ HTTP_BEGIN_ARGS(fromString, 1, 1) HTTP_END_ARGS; HTTP_EMPTY_ARGS(getBody, 0); +HTTP_BEGIN_ARGS(setBody, 0, 1) + HTTP_ARG_VAL(body, 0) +HTTP_END_ARGS; + HTTP_EMPTY_ARGS(getHeaders, 0); HTTP_BEGIN_ARGS(setHeaders, 0, 1) HTTP_ARG_VAL(headers, 0) @@ -100,6 +107,7 @@ zend_class_entry *http_message_object_ce; zend_function_entry http_message_object_fe[] = { HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC) + HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) @@ -120,7 +128,8 @@ zend_function_entry http_message_object_fe[] = { ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC) HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - {NULL, NULL, NULL} + + EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_message_object_handlers; @@ -165,7 +174,7 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message ALLOC_HASHTABLE(OBJ_PROP(o)); zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); - ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_message_object_free, NULL TSRMLS_CC); + ov.handle = putObject(http_message_object, o); ov.handlers = &http_message_object_handlers; return ov; @@ -180,6 +189,12 @@ static inline void _http_message_object_declare_default_properties(TSRMLS_D) { zend_class_entry *ce = http_message_object_ce; +#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); +#endif + DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE); DCL_PROP(PROTECTED, string, body, ""); DCL_PROP(PROTECTED, string, requestMethod, ""); @@ -236,21 +251,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type break; case HTTP_MSG_PROPHASH_HTTP_VERSION: - switch (msg->type) - { - case HTTP_MSG_REQUEST: - RETVAL_DOUBLE(msg->info.request.http_version); - break; - - case HTTP_MSG_RESPONSE: - RETVAL_DOUBLE(msg->info.response.http_version); - break; - - case HTTP_MSG_NONE: - default: - RETVAL_NULL(); - break; - } + RETVAL_DOUBLE(msg->http.version); break; case HTTP_MSG_PROPHASH_BODY: @@ -276,25 +277,22 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type case HTTP_MSG_PROPHASH_PARENT_MESSAGE: if (msg->parent) { RETVAL_OBJVAL(obj->parent); - Z_TYPE_P(return_value) = IS_OBJECT; - return_value->value.obj = obj->parent; - zend_objects_store_add_ref(return_value TSRMLS_CC); } else { RETVAL_NULL(); } break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: - if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) { - RETVAL_STRING(msg->info.request.method, 1); + if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.method) { + RETVAL_STRING(msg->http.info.request.method, 1); } else { RETVAL_NULL(); } break; case HTTP_MSG_PROPHASH_REQUEST_URI: - if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) { - RETVAL_STRING(msg->info.request.URI, 1); + if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.URI) { + RETVAL_STRING(msg->http.info.request.URI, 1); } else { RETVAL_NULL(); } @@ -302,12 +300,20 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type case HTTP_MSG_PROPHASH_RESPONSE_CODE: if (HTTP_MSG_TYPE(RESPONSE, msg)) { - RETVAL_LONG(msg->info.response.code); + RETVAL_LONG(msg->http.info.response.code); } else { RETVAL_NULL(); } break; - + + case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + if (HTTP_MSG_TYPE(RESPONSE, msg) && msg->http.info.response.status) { + RETVAL_STRING(msg->http.info.response.status, 1); + } else { + RETVAL_NULL(); + } + break; + default: RETVAL_NULL(); break; @@ -332,36 +338,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va { case HTTP_MSG_PROPHASH_TYPE: convert_to_long_ex(&value); - if (Z_LVAL_P(value) != msg->type) { - if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.method) { - efree(msg->info.request.method); - } - if (msg->info.request.URI) { - efree(msg->info.request.URI); - } - } - msg->type = Z_LVAL_P(value); - if (HTTP_MSG_TYPE(REQUEST, msg)) { - msg->info.request.method = NULL; - msg->info.request.URI = NULL; - } - } - + http_message_set_type(msg, Z_LVAL_P(value)); break; case HTTP_MSG_PROPHASH_HTTP_VERSION: convert_to_double_ex(&value); - switch (msg->type) - { - case HTTP_MSG_REQUEST: - msg->info.request.http_version = Z_DVAL_P(value); - break; - - case HTTP_MSG_RESPONSE: - msg->info.response.http_version = Z_DVAL_P(value); - break; - } + msg->http.version = Z_DVAL_P(value); break; case HTTP_MSG_PROPHASH_BODY: @@ -387,31 +369,32 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va break; case HTTP_MSG_PROPHASH_REQUEST_METHOD: - convert_to_string_ex(&value); if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.method) { - efree(msg->info.request.method); - } - msg->info.request.method = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); + convert_to_string_ex(&value); + STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); } break; case HTTP_MSG_PROPHASH_REQUEST_URI: - convert_to_string_ex(&value); if (HTTP_MSG_TYPE(REQUEST, msg)) { - if (msg->info.request.URI) { - efree(msg->info.request.URI); - } - msg->info.request.URI = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); + convert_to_string_ex(&value); + STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); } break; case HTTP_MSG_PROPHASH_RESPONSE_CODE: - convert_to_long_ex(&value); if (HTTP_MSG_TYPE(RESPONSE, msg)) { - msg->info.response.code = Z_LVAL_P(value); + convert_to_long_ex(&value); + msg->http.info.response.code = Z_LVAL_P(value); } break; + + case HTTP_MSG_PROPHASH_RESPONSE_STATUS: + if (HTTP_MSG_TYPE(RESPONSE, msg)) { + convert_to_string_ex(&value); + STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value))); + } + } } @@ -426,7 +409,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval array; \ char *m_prop_name; \ int m_prop_len; \ - Z_ARRVAL(array) = OBJ_PROP(obj); \ + INIT_ZARR(array, OBJ_PROP(obj)); \ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \ } @@ -436,7 +419,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval array; \ char *m_prop_name; \ int m_prop_len; \ - Z_ARRVAL(array) = OBJ_PROP(obj); \ + INIT_ZARR(array, OBJ_PROP(obj)); \ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \ } @@ -444,39 +427,39 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zend_hash_clean(OBJ_PROP(obj)); ASSOC_PROP(obj, long, "type", msg->type); - ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); - - MAKE_STD_ZVAL(headers); - array_init(headers); - - zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - ASSOC_PROP(obj, zval, "headers", headers); + ASSOC_PROP(obj, double, "httpVersion", msg->http.version); switch (msg->type) { case HTTP_MSG_REQUEST: - ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version); ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRING(obj, "requestMethod", msg->info.request.method); - ASSOC_STRING(obj, "requestUri", msg->info.request.URI); + ASSOC_STRINGL(obj, "responseStatus", "", 0); + ASSOC_STRING(obj, "requestMethod", msg->http.info.request.method); + ASSOC_STRING(obj, "requestUri", msg->http.info.request.URI); break; case HTTP_MSG_RESPONSE: - ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version); - ASSOC_PROP(obj, long, "responseCode", msg->info.response.code); - ASSOC_STRING(obj, "requestMethod", ""); - ASSOC_STRING(obj, "requestUri", ""); + ASSOC_PROP(obj, long, "responseCode", msg->http.info.response.code); + ASSOC_STRING(obj, "responseStatus", msg->http.info.response.status); + ASSOC_STRINGL(obj, "requestMethod", "", 0); + ASSOC_STRINGL(obj, "requestUri", "", 0); break; case HTTP_MSG_NONE: default: - ASSOC_PROP(obj, double, "httpVersion", 0.0); ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRING(obj, "requestMethod", ""); - ASSOC_STRING(obj, "requestUri", ""); + ASSOC_STRINGL(obj, "responseStatus", "", 0); + ASSOC_STRINGL(obj, "requestMethod", "", 0); + ASSOC_STRINGL(obj, "requestUri", "", 0); break; } + MAKE_STD_ZVAL(headers); + array_init(headers); + zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + ASSOC_PROP(obj, zval, "headers", headers); + ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); + return OBJ_PROP(obj); } @@ -544,6 +527,24 @@ PHP_METHOD(HttpMessage, getBody) } /* }}} */ +/* {{{ proto void HttpMessage::setBody(string body) + * + * Set the body of the HttpMessage. + * NOTE: Don't forget to update any headers accordingly. + */ +PHP_METHOD(HttpMessage, setBody) +{ + char *body; + int len; + getObject(http_message_object, obj); + + 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); + } +} +/* }}} */ + /* {{{ proto array HttpMessage::getHeaders() * * Get Message Headers. @@ -556,7 +557,7 @@ PHP_METHOD(HttpMessage, getHeaders) zval headers; getObject(http_message_object, obj); - Z_ARRVAL(headers) = &obj->message->hdrs; + INIT_ZARR(headers, &obj->message->hdrs); array_init(return_value); array_copy(&headers, return_value); } @@ -577,7 +578,7 @@ PHP_METHOD(HttpMessage, setHeaders) } zend_hash_clean(&obj->message->hdrs); - Z_ARRVAL(old_headers) = &obj->message->hdrs; + INIT_ZARR(old_headers, &obj->message->hdrs); array_copy(new_headers, &old_headers); } /* }}} */ @@ -596,7 +597,7 @@ PHP_METHOD(HttpMessage, addHeaders) return; } - Z_ARRVAL(old_headers) = &obj->message->hdrs; + INIT_ZARR(old_headers, &obj->message->hdrs); if (append) { array_append(new_headers, &old_headers); } else { @@ -648,11 +649,11 @@ PHP_METHOD(HttpMessage, getResponseCode) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) { - http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE"); + http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE"); RETURN_NULL(); } - RETURN_LONG(obj->message->info.response.code); + RETURN_LONG(obj->message->http.info.response.code); } } /* }}} */ @@ -669,7 +670,7 @@ PHP_METHOD(HttpMessage, setResponseCode) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE"); + http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE"); RETURN_FALSE; } @@ -677,11 +678,11 @@ PHP_METHOD(HttpMessage, setResponseCode) RETURN_FALSE; } if (code < 100 || code > 510) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid response code (100-510): %ld", code); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid response code (100-510): %ld", code); RETURN_FALSE; } - obj->message->info.response.code = code; + obj->message->http.info.response.code = code; RETURN_TRUE; } /* }}} */ @@ -699,11 +700,11 @@ PHP_METHOD(HttpMessage, getRequestMethod) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); + http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); RETURN_NULL(); } - RETURN_STRING(obj->message->info.request.method, 1); + RETURN_STRING(obj->message->http.info.request.method, 1); } } /* }}} */ @@ -720,7 +721,7 @@ PHP_METHOD(HttpMessage, setRequestMethod) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); + http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); RETURN_FALSE; } @@ -728,15 +729,15 @@ PHP_METHOD(HttpMessage, setRequestMethod) RETURN_FALSE; } if (method_len < 1) { - http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestMethod to an empty string"); + http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestMethod to an empty string"); RETURN_FALSE; } if (SUCCESS != http_check_method(method)) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Unkown request method: %s", method); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unkown request method: %s", method); RETURN_FALSE; } - STR_SET(obj->message->info.request.method, estrndup(method, method_len)); + STR_SET(obj->message->http.info.request.method, estrndup(method, method_len)); RETURN_TRUE; } /* }}} */ @@ -753,11 +754,11 @@ PHP_METHOD(HttpMessage, getRequestUri) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); + http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); RETURN_NULL(); } - RETURN_STRING(obj->message->info.request.URI, 1); + RETURN_STRING(obj->message->http.info.request.URI, 1); } } /* }}} */ @@ -775,18 +776,18 @@ PHP_METHOD(HttpMessage, setRequestUri) getObject(http_message_object, obj); if (!HTTP_MSG_TYPE(REQUEST, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST"); + http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); RETURN_FALSE; } if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URI, &URIlen)) { RETURN_FALSE; } if (URIlen < 1) { - http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestUri to an empty string"); + http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestUri to an empty string"); RETURN_FALSE; } - STR_SET(obj->message->info.request.URI, estrndup(URI, URIlen)); + STR_SET(obj->message->http.info.request.URI, estrndup(URI, URIlen)); RETURN_TRUE; } /* }}} */ @@ -801,24 +802,9 @@ PHP_METHOD(HttpMessage, getHttpVersion) IF_RETVAL_USED { char ver[4] = {0}; - double version; getObject(http_message_object, obj); - switch (obj->message->type) - { - case HTTP_MSG_RESPONSE: - version = obj->message->info.response.http_version; - break; - - case HTTP_MSG_REQUEST: - version = obj->message->info.request.http_version; - break; - - case HTTP_MSG_NONE: - default: - RETURN_NULL(); - } - sprintf(ver, "%1.1lf", version); + sprintf(ver, "%1.1lf", obj->message->http.version); RETURN_STRINGL(ver, 3, 1); } } @@ -839,23 +825,14 @@ PHP_METHOD(HttpMessage, setHttpVersion) return; } - if (HTTP_MSG_TYPE(NONE, obj->message)) { - http_error(E_WARNING, HTTP_E_MSG, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST"); - RETURN_FALSE; - } - convert_to_double(zv); sprintf(v, "%1.1lf", Z_DVAL_P(zv)); if (strcmp(v, "1.0") && strcmp(v, "1.1")) { - http_error_ex(E_WARNING, HTTP_E_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): %s", v); RETURN_FALSE; } - if (HTTP_MSG_TYPE(RESPONSE, obj->message)) { - obj->message->info.response.http_version = Z_DVAL_P(zv); - } else { - obj->message->info.request.http_version = Z_DVAL_P(zv); - } + obj->message->http.version = Z_DVAL_P(zv); RETURN_TRUE; } /* }}} */