X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=d0617b639919f36243a6ba856092973483a57807;hb=2945591b02528824cc52b0affb44cdd64743d820;hp=0a7515744cfd5fefeba7ac7b36c9b0e1f37d7c21;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http diff --git a/http.c b/http.c index 0a75157..d0617b6 100644 --- a/http.c +++ b/http.c @@ -62,8 +62,7 @@ ZEND_GET_MODULE(http) zend_function_entry http_functions[] = { PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) - PHP_FE(http_build_uri, NULL) - PHP_FALIAS(http_absolute_uri, http_build_uri, NULL) + PHP_FE(http_build_url, http_arg_pass_ref_3) PHP_FE(http_negotiate_language, http_arg_pass_ref_2) PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2) @@ -83,6 +82,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_chunked_decode, NULL) PHP_FE(http_parse_message, NULL) PHP_FE(http_parse_headers, NULL) + PHP_FE(http_parse_cookie, NULL) PHP_FE(http_get_request_headers, NULL) PHP_FE(http_get_request_body, NULL) PHP_FE(http_match_request_header, NULL) @@ -107,8 +107,6 @@ zend_function_entry http_functions[] = { PHP_FE(http_gzdecode, NULL) PHP_FE(http_deflate, NULL) PHP_FE(http_inflate, NULL) - PHP_FE(http_compress, NULL) - PHP_FE(http_uncompress, NULL) #endif PHP_FE(http_support, NULL) @@ -162,12 +160,6 @@ static inline void http_globals_init(zend_http_globals *G) { G->send.buffer_size = HTTP_SENDBUF_SIZE; zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0); -#ifdef HTTP_HAVE_CURL - zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0); - zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0); - zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0); - zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0); -#endif } static inline void http_globals_free(zend_http_globals *G) @@ -175,12 +167,6 @@ static inline void http_globals_free(zend_http_globals *G) STR_SET(G->send.content_type, NULL); STR_SET(G->send.unquoted_etag, NULL); zend_hash_destroy(&G->request.methods.custom); -#ifdef HTTP_HAVE_CURL - zend_llist_clean(&G->request.copies.strings); - zend_llist_clean(&G->request.copies.slists); - zend_llist_clean(&G->request.copies.contexts); - zend_llist_clean(&G->request.copies.convs); -#endif } /* }}} */