X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_factory.c;h=8d18ab1d4b8a52b189cc12def483e2bc70b9658a;hp=a4ac4f0cd5e622854f3eb03b8172c09d18032797;hb=19a017f746fe281d828d1783ef2a5991ce6114e4;hpb=7dc5de0b79846bfe33ca36a9eeb894ef2ecfdee1 diff --git a/php_http_request_factory.c b/php_http_request_factory.c index a4ac4f0..8d18ab1 100644 --- a/php_http_request_factory.c +++ b/php_http_request_factory.c @@ -1,9 +1,18 @@ +/* + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2011, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#include "php_http_api.h" -#include "php_http.h" - -#include #include -#include /* * array of name => php_http_request_factory_driver_t* @@ -50,15 +59,20 @@ PHP_HTTP_BEGIN_ARGS(__construct, 1) PHP_HTTP_ARG_VAL(options, 0) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(createRequest, 0) - PHP_HTTP_ARG_VAL(persistentHandle, 0) + PHP_HTTP_ARG_VAL(url, 0) + PHP_HTTP_ARG_VAL(method, 0) + PHP_HTTP_ARG_VAL(options, 0) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(createPool, 0) - PHP_HTTP_ARG_VAL(persistentHandle, 0) + PHP_HTTP_ARG_OBJ(http\\Request, request1, 1) + PHP_HTTP_ARG_OBJ(http\\Request, request2, 1) + PHP_HTTP_ARG_OBJ(http\\Request, requestN, 1) PHP_HTTP_END_ARGS; PHP_HTTP_BEGIN_ARGS(createDataShare, 0) - PHP_HTTP_ARG_VAL(persistentHandle, 0) + PHP_HTTP_ARG_OBJ(http\\Request, request1, 1) + PHP_HTTP_ARG_OBJ(http\\Request, request2, 1) + PHP_HTTP_ARG_OBJ(http\\Request, requestN, 1) PHP_HTTP_END_ARGS; -PHP_HTTP_EMPTY_ARGS(getGlobalDataShareInstance); PHP_HTTP_EMPTY_ARGS(getDriver); PHP_HTTP_EMPTY_ARGS(getAvailableDrivers); @@ -68,7 +82,6 @@ zend_function_entry php_http_request_factory_method_entry[] = { PHP_HTTP_REQUEST_FACTORY_ME(createRequest, ZEND_ACC_PUBLIC) PHP_HTTP_REQUEST_FACTORY_ME(createPool, ZEND_ACC_PUBLIC) PHP_HTTP_REQUEST_FACTORY_ME(createDataShare, ZEND_ACC_PUBLIC) - PHP_HTTP_REQUEST_FACTORY_ME(getGlobalDataShareInstance, ZEND_ACC_PUBLIC) PHP_HTTP_REQUEST_FACTORY_ME(getDriver, ZEND_ACC_PUBLIC) PHP_HTTP_REQUEST_FACTORY_ME(getAvailableDrivers, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) @@ -89,7 +102,7 @@ PHP_METHOD(HttpRequestFactory, __construct) FOREACH_HASH_KEYVAL(pos, options, key, val) { if (key.type == HASH_KEY_IS_STRING) { zval *newval = php_http_zsep(1, Z_TYPE_PP(val), *val); - zend_update_property(php_http_request_factory_class_entry, getThis(), key.str, key.len - 1, newval); + zend_update_property(php_http_request_factory_class_entry, getThis(), key.str, key.len - 1, newval TSRMLS_CC); zval_ptr_dtor(&newval); } } @@ -100,24 +113,23 @@ PHP_METHOD(HttpRequestFactory, __construct) PHP_METHOD(HttpRequestFactory, createRequest) { - char *url_str = NULL; - int url_len; - long meth = -1; + char *meth_str = NULL, *url_str = NULL; + int meth_len, url_len; zval *options = NULL; with_error_handling(EH_THROW, php_http_exception_class_entry) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!la!", &url_str, &url_len, &meth, &options)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!a!", &url_str, &url_len, &meth_str, &meth_len, &options)) { with_error_handling(EH_THROW, php_http_exception_class_entry) { zval *zdriver, *os; zend_object_value ov; zend_class_entry *class_entry = NULL; - php_http_request_t *req = NULL; + php_http_client_t *req = NULL; php_http_request_factory_driver_t driver; class_entry = php_http_request_factory_get_class_entry(getThis(), ZEND_STRL("requestClass") TSRMLS_CC); if (!class_entry) { - class_entry = php_http_request_class_entry; + class_entry = php_http_client_class_entry; } zdriver = zend_read_property(php_http_request_factory_class_entry, getThis(), ZEND_STRL("driver"), 0 TSRMLS_CC); @@ -134,39 +146,33 @@ PHP_METHOD(HttpRequestFactory, createRequest) name_len = spprintf(&name_str, 0, "http_request.%s", Z_STRVAL_P(zdriver)); if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { - php_http_resource_factory_ops_t ops = { - php_http_persistent_handle_acquire, - php_http_persistent_handle_accrete, - php_http_persistent_handle_release - }; - - rf = php_http_resource_factory_init(NULL, &ops, pf, php_http_persistent_handle_abandon TSRMLS_CC); + rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon); } efree(name_str); } - req = php_http_request_init(NULL, driver.request_ops, rf, NULL TSRMLS_CC); + req = php_http_client_init(NULL, driver.request_ops, rf, NULL TSRMLS_CC); if (req) { - if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_object_new_ex, php_http_request_class_entry, req, NULL TSRMLS_CC)) { + if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_client_object_new_ex, php_http_client_class_entry, req, NULL TSRMLS_CC)) { ZVAL_OBJVAL(return_value, ov, 0); MAKE_STD_ZVAL(os); object_init_ex(os, spl_ce_SplObjectStorage); - zend_update_property(php_http_request_class_entry, return_value, ZEND_STRL("observers"), os TSRMLS_CC); + zend_update_property(php_http_client_class_entry, return_value, ZEND_STRL("observers"), os TSRMLS_CC); zval_ptr_dtor(&os); if (url_str) { - zend_update_property_stringl(php_http_request_class_entry, return_value, ZEND_STRL("url"), url_str, url_len TSRMLS_CC); + zend_update_property_stringl(php_http_client_class_entry, return_value, ZEND_STRL("url"), url_str, url_len TSRMLS_CC); } - if (meth > 0) { - zend_update_property_long(php_http_request_class_entry, return_value, ZEND_STRL("method"), meth TSRMLS_CC); + if (meth_str) { + zend_update_property_stringl(php_http_client_class_entry, return_value, ZEND_STRL("method"), meth_str, meth_len TSRMLS_CC); } if (options) { zend_call_method_with_1_params(&return_value, Z_OBJCE_P(return_value), NULL, "setoptions", NULL, options); } } else { - php_http_request_free(&req); + php_http_client_free(&req); } } @@ -211,13 +217,7 @@ PHP_METHOD(HttpRequestFactory, createPool) name_len = spprintf(&name_str, 0, "http_request_pool.%s", Z_STRVAL_P(zdriver)); if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { - php_http_resource_factory_ops_t ops = { - php_http_persistent_handle_acquire, - php_http_persistent_handle_accrete, - php_http_persistent_handle_release - }; - - rf = php_http_resource_factory_init(NULL, &ops, pf, php_http_persistent_handle_abandon TSRMLS_CC); + rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon); } efree(name_str); @@ -228,7 +228,7 @@ PHP_METHOD(HttpRequestFactory, createPool) if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_pool_object_new_ex, php_http_request_pool_class_entry, pool, NULL TSRMLS_CC)) { ZVAL_OBJVAL(return_value, ov, 0); for (i = 0; i < argc; ++i) { - if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), php_http_request_class_entry TSRMLS_CC)) { + if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), php_http_client_class_entry TSRMLS_CC)) { php_http_request_pool_attach(pool, *(argv[i])); } } @@ -258,7 +258,7 @@ PHP_METHOD(HttpRequestFactory, createDataShare) zval *zdriver; zend_object_value ov; zend_class_entry *class_entry; - php_http_request_datashare_t *share = NULL; + php_http_client_datashare_t *share = NULL; php_http_request_factory_driver_t driver; if (!(class_entry = php_http_request_factory_get_class_entry(getThis(), ZEND_STRL("requestDataShareClass") TSRMLS_CC))) { @@ -278,24 +278,18 @@ PHP_METHOD(HttpRequestFactory, createDataShare) name_len = spprintf(&name_str, 0, "http_request_datashare.%s", Z_STRVAL_P(zdriver)); if ((pf = php_http_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) { - php_http_resource_factory_ops_t ops = { - php_http_persistent_handle_acquire, - php_http_persistent_handle_accrete, - php_http_persistent_handle_release - }; - - rf = php_http_resource_factory_init(NULL, &ops, pf, php_http_persistent_handle_abandon TSRMLS_CC); + rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon); } efree(name_str); } - share = php_http_request_datashare_init(NULL, driver.request_datashare_ops, rf, NULL, 0 TSRMLS_CC); + share = php_http_client_datashare_init(NULL, driver.request_datashare_ops, rf, NULL TSRMLS_CC); if (share) { if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_datashare_object_new_ex, php_http_request_datashare_class_entry, share, NULL TSRMLS_CC)) { ZVAL_OBJVAL(return_value, ov, 0); for (i = 0; i < argc; ++i) { - if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), php_http_request_class_entry TSRMLS_CC)) { + if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), php_http_client_class_entry TSRMLS_CC)) { php_http_request_datashare_attach(share, *(argv[i])); } } @@ -313,48 +307,6 @@ PHP_METHOD(HttpRequestFactory, createDataShare) } end_error_handling(); } -PHP_METHOD(HttpRequestFactory, getGlobalDataShareInstance) -{ - with_error_handling(EH_THROW, php_http_exception_class_entry) { - if (SUCCESS == zend_parse_parameters_none()) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { - zval *instance = *zend_std_get_static_property(php_http_request_datashare_class_entry, ZEND_STRL("instance"), 0, NULL TSRMLS_CC); - - if (Z_TYPE_P(instance) != IS_OBJECT) { - zval *zdriver; - zend_object_value ov; - zend_class_entry *class_entry; - php_http_request_datashare_t *share; - - if (!(class_entry = php_http_request_factory_get_class_entry(getThis(), ZEND_STRL("requestDataShareClass") TSRMLS_CC))) { - class_entry = php_http_request_datashare_class_entry; - } - - if ((zdriver = zend_read_property(php_http_request_factory_class_entry, getThis(), ZEND_STRL("driver"), 0 TSRMLS_CC)) - && (IS_STRING == Z_TYPE_P(zdriver)) - && (share = php_http_request_datashare_global_get(Z_STRVAL_P(zdriver), Z_STRLEN_P(zdriver) TSRMLS_CC)) - && (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_request_datashare_object_new_ex, php_http_request_datashare_class_entry, share, NULL TSRMLS_CC)) - ) { - MAKE_STD_ZVAL(instance); - ZVAL_OBJVAL(instance, ov, 0); - zend_update_static_property(php_http_request_datashare_class_entry, ZEND_STRL("instance"), instance TSRMLS_CC); - - if (PHP_HTTP_G->request_datashare.cookie) { - zend_update_property_bool(php_http_request_datashare_class_entry, instance, ZEND_STRL("cookie"), PHP_HTTP_G->request_datashare.cookie TSRMLS_CC); - } - if (PHP_HTTP_G->request_datashare.dns) { - zend_update_property_bool(php_http_request_datashare_class_entry, instance, ZEND_STRL("dns"), PHP_HTTP_G->request_datashare.dns TSRMLS_CC); - } - } - } - - RETVAL_ZVAL(instance, 1, 0); - } end_error_handling(); - } - } end_error_handling(); -} - - PHP_METHOD(HttpRequestFactory, getDriver) { if (SUCCESS == zend_parse_parameters_none()) { @@ -382,7 +334,7 @@ PHP_MINIT_FUNCTION(http_request_factory) { zend_hash_init(&php_http_request_factory_drivers, 0, NULL, NULL, 1); - PHP_HTTP_REGISTER_CLASS(http\\request, Factory, http_request_factory, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, Factory, http_request_factory, php_http_object_class_entry, 0); php_http_request_factory_class_entry->create_object = php_http_request_factory_new; zend_declare_property_stringl(php_http_request_factory_class_entry, ZEND_STRL("driver"), ZEND_STRL("curl"), ZEND_ACC_PROTECTED TSRMLS_CC); @@ -401,3 +353,13 @@ PHP_MSHUTDOWN_FUNCTION(http_request_factory) return SUCCESS; } + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ +