X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=12c189e8656dd6a1f1df37e1ec1f21f2a17aa5f8;hp=76c79ff0ec340c15d1ba8b5386b6da6def53e522;hb=e76f27074a23b1cf83fdd81f97a5c767399225a6;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0 diff --git a/php_http_message.c b/php_http_message.c index 76c79ff..12c189e 100644 --- a/php_http_message.c +++ b/php_http_message.c @@ -24,7 +24,7 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa /* advance message */ if (old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) { - (*message) = php_http_message_init(NULL, 0); + (*message) = php_http_message_init(NULL, 0 TSRMLS_CC); (*message)->parent = old; (*headers) = &((*message)->hdrs); } @@ -60,7 +60,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m switch (type) { case PHP_HTTP_REQUEST: if ((sval = php_http_env_get_server_var(ZEND_STRL("SERVER_PROTOCOL"), 1 TSRMLS_CC)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) { - php_http_version_parse(&message->http.version, Z_STRVAL_P(sval)); + php_http_version_parse(&message->http.version, Z_STRVAL_P(sval) TSRMLS_CC); } else { message->http.version.major = 1; message->http.version.minor = 1; @@ -76,7 +76,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m if ((mbody = php_http_env_get_request_body(TSRMLS_C))) { php_http_message_body_dtor(&message->body); - php_http_message_body_copy(mbody, &message->body, 0 TSRMLS_CC); + php_http_message_body_copy(mbody, &message->body, 0); } break; @@ -99,7 +99,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m php_http_env_get_response_headers(&message->hdrs TSRMLS_CC); - if (php_output_get_level()) { + if (php_output_get_level(TSRMLS_C)) { if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_SENT) { php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(TSRMLS_C), php_output_get_start_lineno(TSRMLS_C)); goto error; @@ -154,11 +154,12 @@ PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_st zval *header_str, **val; HashPosition pos; php_http_buffer_t str; + TSRMLS_FETCH_FROM_CTX(msg->ts); php_http_buffer_init(&str); MAKE_STD_ZVAL(header_str); FOREACH_VAL(pos, *header, val) { - zval *strval = php_http_zsep(IS_STRING, *val); + zval *strval = php_http_ztyp(IS_STRING, *val); php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_P(strval)); zval_ptr_dtor(&strval); } @@ -166,7 +167,7 @@ PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_st ZVAL_STRINGL(header_str, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0); ret = header_str; } else { - ret = php_http_zsep(IS_STRING, *header); + ret = php_http_ztyp(IS_STRING, *header); } } @@ -227,6 +228,7 @@ static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *s HashPosition pos1; zval **header, *h; size_t size; + TSRMLS_FETCH_FROM_CTX(msg->ts); switch (msg->type) { case PHP_HTTP_REQUEST: @@ -244,7 +246,7 @@ static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *s if ((size = php_http_message_body_size(&msg->body))) { MAKE_STD_ZVAL(h); ZVAL_LONG(h, size); - zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL); + zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL); if (msg->body.boundary) { char *str; @@ -317,7 +319,6 @@ static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *s PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg) { php_http_buffer_t str; - TSRMLS_FETCH_FROM_CTX(msg->ts); php_http_buffer_init_ex(&str, 0x1000, 0); message_headers(msg, &str); @@ -325,9 +326,9 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http php_http_buffer_dtor(&str); if (php_http_message_body_size(&msg->body)) { - cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF) TSRMLS_CC); + cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF)); php_http_message_body_to_callback(&msg->body, cb, cb_arg, 0, 0); - cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF) TSRMLS_CC); + cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF)); } } @@ -381,8 +382,9 @@ PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *ms php_http_message_count(c, msg); if (c > 1) { - php_http_message_t *tmp = msg, **arr = ecalloc(c, sizeof(**arr)); - + php_http_message_t *tmp = msg, **arr; + + arr = ecalloc(c, sizeof(**arr)); for (i = 0; i < c; ++i) { arr[i] = tmp; tmp = tmp->parent; @@ -425,11 +427,12 @@ PHP_HTTP_API php_http_message_t *php_http_message_interconnect(php_http_message_ return m1; } -PHP_HTTP_API void php_http_message_to_struct(php_http_message_t *msg, zval *obj TSRMLS_DC) +PHP_HTTP_API void php_http_message_to_struct(php_http_message_t *msg, zval *obj) { zval strct; zval *headers; char *version; + TSRMLS_FETCH_FROM_CTX(msg->ts); INIT_PZVAL_ARRAY(&strct, HASH_OF(obj)); @@ -564,7 +567,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) } */ -PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to) +PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents) { php_http_message_t *temp, *copy = NULL; php_http_info_t info; @@ -574,16 +577,16 @@ PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, info.type = from->type; info.http = from->http; - copy = temp = php_http_message_init(to, 0); + copy = temp = php_http_message_init(to, 0 TSRMLS_CC); php_http_message_set_info(temp, &info); zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); php_http_message_body_copy(&from->body, &temp->body, 1); - while (from->parent) { + if (parents) while (from->parent) { info.type = from->parent->type; info.http = from->parent->http; - temp->parent = php_http_message_init(NULL, 0); + temp->parent = php_http_message_init(NULL, 0 TSRMLS_CC); php_http_message_set_info(temp->parent, &info); zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); php_http_message_body_copy(&from->body, &temp->body, 1); @@ -596,6 +599,11 @@ PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, return copy; } +PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to) +{ + return php_http_message_copy_ex(from, to, 1); +} + PHP_HTTP_API void php_http_message_dtor(php_http_message_t *message) { if (message) { @@ -702,20 +710,12 @@ PHP_HTTP_BEGIN_ARGS(setHttpVersion, 1) PHP_HTTP_ARG_VAL(http_version, 0) PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(guessContentType, 1) - PHP_HTTP_ARG_VAL(magic_file, 0) - PHP_HTTP_ARG_VAL(magic_mode, 0) -PHP_HTTP_END_ARGS; - PHP_HTTP_EMPTY_ARGS(getParentMessage); -PHP_HTTP_EMPTY_ARGS(send); PHP_HTTP_EMPTY_ARGS(__toString); PHP_HTTP_BEGIN_ARGS(toString, 0) PHP_HTTP_ARG_VAL(include_parent, 0) PHP_HTTP_END_ARGS; -PHP_HTTP_EMPTY_ARGS(toMessageTypeObject); - PHP_HTTP_EMPTY_ARGS(count); PHP_HTTP_EMPTY_ARGS(serialize); @@ -804,9 +804,11 @@ static STATUS php_http_message_object_add_prophandler(const char *prop_str, size php_http_message_object_prophandler_t h = { read, write }; return zend_hash_add(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) &h, sizeof(h), NULL); } +/* static int php_http_message_object_has_prophandler(const char *prop_str, size_t prop_len) { return zend_hash_exists(&php_http_message_object_prophandlers, prop_str, prop_len + 1); } +*/ static STATUS php_http_message_object_get_prophandler(const char *prop_str, size_t prop_len, php_http_message_object_prophandler_t **handler) { return zend_hash_find(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) handler); } @@ -814,7 +816,7 @@ static void php_http_message_object_prophandler_get_type(php_http_message_object RETVAL_LONG(obj->message->type); } static void php_http_message_object_prophandler_set_type(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_zsep(IS_LONG, value); + zval *cpy = php_http_ztyp(IS_LONG, value); php_http_message_set_type(obj->message, Z_LVAL_P(cpy)); zval_ptr_dtor(&cpy); } @@ -827,7 +829,7 @@ static void php_http_message_object_prophandler_get_request_method(php_http_mess } static void php_http_message_object_prophandler_set_request_method(php_http_message_object_t *obj, zval *value TSRMLS_DC) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - zval *cpy = php_http_zsep(IS_STRING, value); + zval *cpy = php_http_ztyp(IS_STRING, value); STR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); zval_ptr_dtor(&cpy); } @@ -841,7 +843,7 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message } static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - zval *cpy = php_http_zsep(IS_STRING, value); + zval *cpy = php_http_ztyp(IS_STRING, value); STR_SET(obj->message->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); zval_ptr_dtor(&cpy); } @@ -855,7 +857,7 @@ static void php_http_message_object_prophandler_get_response_status(php_http_mes } static void php_http_message_object_prophandler_set_response_status(php_http_message_object_t *obj, zval *value TSRMLS_DC) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) { - zval *cpy = php_http_zsep(IS_STRING, value); + zval *cpy = php_http_ztyp(IS_STRING, value); STR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); zval_ptr_dtor(&cpy); } @@ -869,7 +871,7 @@ static void php_http_message_object_prophandler_get_response_code(php_http_messa } static void php_http_message_object_prophandler_set_response_code(php_http_message_object_t *obj, zval *value TSRMLS_DC) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) { - zval *cpy = php_http_zsep(IS_LONG, value); + zval *cpy = php_http_ztyp(IS_LONG, value); obj->message->http.info.response.code = Z_LVAL_P(cpy); zval_ptr_dtor(&cpy); } @@ -882,7 +884,7 @@ static void php_http_message_object_prophandler_get_http_version(php_http_messag RETVAL_STRINGL(version_str, version_len, 0); } static void php_http_message_object_prophandler_set_http_version(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_zsep(IS_STRING, value); + zval *cpy = php_http_ztyp(IS_STRING, value); php_http_version_parse(&obj->message->http.version, Z_STRVAL_P(cpy) TSRMLS_CC); zval_ptr_dtor(&cpy); } @@ -891,7 +893,7 @@ static void php_http_message_object_prophandler_get_headers(php_http_message_obj zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); } static void php_http_message_object_prophandler_set_headers(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_zsep(IS_ARRAY, value); + zval *cpy = php_http_ztyp(IS_ARRAY, value); zend_hash_clean(&obj->message->hdrs); zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); @@ -941,7 +943,7 @@ PHP_MINIT_FUNCTION(http_message) php_http_message_object_handlers.get_properties = php_http_message_object_get_props; php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr; - zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator, php_http_fluently_callable_class_entry); + zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1); zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); @@ -1105,7 +1107,7 @@ zend_object_value php_http_message_object_clone(zval *this_ptr TSRMLS_DC) php_http_message_object_t *new_obj = NULL; php_http_message_object_t *old_obj = zend_object_store_get_object(this_ptr TSRMLS_CC); - new_ov = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL), &new_obj); + new_ov = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL), &new_obj TSRMLS_CC); zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); return new_ov; @@ -1139,7 +1141,7 @@ void php_http_message_object_free(void *object TSRMLS_DC) static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC) { php_http_message_object_prophandler_t *handler; - zval *copy = php_http_zsep(IS_STRING, member); + zval *copy = php_http_ztyp(IS_STRING, member); if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { zval_ptr_dtor(©); @@ -1154,7 +1156,7 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t { php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); php_http_message_object_prophandler_t *handler; - zval *return_value, *copy = php_http_zsep(IS_STRING, member); + zval *return_value, *copy = php_http_ztyp(IS_STRING, member); if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { if (type == BP_VAR_W) { @@ -1182,7 +1184,7 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval { php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); php_http_message_object_prophandler_t *handler; - zval *copy = php_http_zsep(IS_STRING, member); + zval *copy = php_http_ztyp(IS_STRING, member); if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { handler->write(obj, value TSRMLS_CC); @@ -1282,13 +1284,13 @@ PHP_METHOD(HttpMessage, __construct) char *message = NULL; php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) { php_http_message_t *msg = obj->message; php_http_message_dtor(msg); - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) { - if ((obj->message = php_http_message_parse(msg, message, length))) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { + if ((obj->message = php_http_message_parse(msg, message, length TSRMLS_CC))) { if (obj->message->parent) { obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC); } @@ -1306,7 +1308,7 @@ PHP_METHOD(HttpMessage, __construct) PHP_METHOD(HttpMessage, getBody) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1740,7 +1742,7 @@ PHP_METHOD(HttpMessage, setRequestUrl) PHP_METHOD(HttpMessage, getParentMessage) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -1823,7 +1825,7 @@ PHP_METHOD(HttpMessage, unserialize) PHP_METHOD(HttpMessage, detach) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);