X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_client_factory.c;h=ef774240f74f8c26f8112380b87fb8bd87607bee;hb=bfa5d473bdfb59fd39f04c2b8fb77ea4a7e9421b;hp=87c4419eb09c2e07ec8542a4cbba9c86630a14fd;hpb=181671a28686defeb8504bba7dd0b1ba7c9d4741;p=m6w6%2Fext-http

diff --git a/php_http_client_factory.c b/php_http_client_factory.c
index 87c4419..ef77424 100644
--- a/php_http_client_factory.c
+++ b/php_http_client_factory.c
@@ -38,10 +38,8 @@ PHP_HTTP_API STATUS php_http_client_factory_get_driver(const char *name_str, siz
 static zend_class_entry *php_http_client_factory_find_class_entry(zval *this_ptr, const char *for_str, size_t for_len TSRMLS_DC)
 {
 	/* stupid non-const api */
-	char *sc = estrndup(for_str, for_len);
-	zval *cn = zend_read_property(Z_OBJCE_P(getThis()), getThis(), sc, for_len, 0 TSRMLS_CC);
+	zval *cn = zend_read_property(Z_OBJCE_P(getThis()), getThis(), for_str, for_len, 0 TSRMLS_CC);
 
-	efree(sc);
 	if (Z_TYPE_P(cn) == IS_STRING && Z_STRLEN_P(cn)) {
 		return zend_fetch_class(Z_STRVAL_P(cn), Z_STRLEN_P(cn), 0 TSRMLS_CC);
 	}
@@ -132,17 +130,17 @@ PHP_METHOD(HttpClientFactory, createClient)
 
 				if ((IS_STRING == Z_TYPE_P(zdriver)) && (SUCCESS == php_http_client_factory_get_driver(Z_STRVAL_P(zdriver), Z_STRLEN_P(zdriver), &driver)) && driver.client_ops) {
 					zval *phi = php_http_zsep(1, IS_STRING, zend_read_property(php_http_client_factory_class_entry, getThis(), ZEND_STRL("persistentHandleId"), 0 TSRMLS_CC));
-					php_http_resource_factory_t *rf = NULL;
+					php_resource_factory_t *rf = NULL;
 
 					if (Z_STRLEN_P(phi)) {
 						char *name_str;
 						size_t name_len;
-						php_http_persistent_handle_factory_t *pf;
+						php_persistent_handle_factory_t *pf;
 
 						name_len = spprintf(&name_str, 0, "http_client.%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))) {
-							rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+						if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
+							rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon);
 						}
 
 						efree(name_str);
@@ -189,17 +187,17 @@ PHP_METHOD(HttpClientFactory, createPool)
 				zdriver = zend_read_property(php_http_client_factory_class_entry, getThis(), ZEND_STRL("driver"), 0 TSRMLS_CC);
 				if ((IS_STRING == Z_TYPE_P(zdriver)) && (SUCCESS == php_http_client_factory_get_driver(Z_STRVAL_P(zdriver), Z_STRLEN_P(zdriver), &driver)) && driver.client_pool_ops) {
 					zval *phi = php_http_zsep(1, IS_STRING, zend_read_property(php_http_client_factory_class_entry, getThis(), ZEND_STRL("persistentHandleId"), 0 TSRMLS_CC));
-					php_http_resource_factory_t *rf = NULL;
+					php_resource_factory_t *rf = NULL;
 
 					if (Z_STRLEN_P(phi)) {
 						char *name_str;
 						size_t name_len;
-						php_http_persistent_handle_factory_t *pf;
+						php_persistent_handle_factory_t *pf;
 
 						name_len = spprintf(&name_str, 0, "http_client_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))) {
-							rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+						if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
+							rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon);
 						}
 
 						efree(name_str);
@@ -254,17 +252,17 @@ PHP_METHOD(HttpClientFactory, createDataShare)
 				zdriver = zend_read_property(php_http_client_factory_class_entry, getThis(), ZEND_STRL("driver"), 0 TSRMLS_CC);
 				if ((IS_STRING == Z_TYPE_P(zdriver)) && (SUCCESS == php_http_client_factory_get_driver(Z_STRVAL_P(zdriver), Z_STRLEN_P(zdriver), &driver)) && driver.client_datashare_ops) {
 					zval *phi = php_http_zsep(1, IS_STRING, zend_read_property(php_http_client_factory_class_entry, getThis(), ZEND_STRL("persistentHandleId"), 0 TSRMLS_CC));
-					php_http_resource_factory_t *rf = NULL;
+					php_resource_factory_t *rf = NULL;
 
 					if (Z_STRLEN_P(phi)) {
 						char *name_str;
 						size_t name_len;
-						php_http_persistent_handle_factory_t *pf;
+						php_persistent_handle_factory_t *pf;
 
 						name_len = spprintf(&name_str, 0, "http_client_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))) {
-							rf = php_http_resource_factory_init(NULL, php_http_persistent_handle_resource_factory_ops(), pf, (void (*)(void *)) php_http_persistent_handle_abandon);
+						if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, Z_STRVAL_P(phi), Z_STRLEN_P(phi) TSRMLS_CC))) {
+							rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void *)) php_persistent_handle_abandon);
 						}
 
 						efree(name_str);