diff options
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/php_encoding.c | 10 | ||||
| -rw-r--r-- | ext/soap/php_http.c | 2 | ||||
| -rw-r--r-- | ext/soap/php_packet_soap.c | 4 | ||||
| -rw-r--r-- | ext/soap/soap.c | 12 |
4 files changed, 14 insertions, 14 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 2f7008b5b2..b48f61591b 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -346,8 +346,8 @@ static zend_bool soap_check_xml_ref(zval **data, xmlNodePtr node TSRMLS_DC) if (*data != *data_ptr) { zval_ptr_dtor(data); *data = *data_ptr; - (*data)->is_ref = 1; - (*data)->refcount++; + Z_SET_ISREF_PP(data); + Z_ADDREF_PP(data); return 1; } } else { @@ -1195,7 +1195,7 @@ static void set_zval_property(zval* object, char* name, zval* val TSRMLS_DC) old_scope = EG(scope); EG(scope) = Z_OBJCE_P(object); #ifdef ZEND_ENGINE_2 - val->refcount--; + Z_DELREF_P(val); #endif add_property_zval(object, name, val); EG(scope) = old_scope; @@ -1621,7 +1621,7 @@ static zval *to_zval_object_ex(encodeTypePtr type, xmlNodePtr data, zend_class_e MAKE_STD_ZVAL(arr); array_init(arr); - prop->refcount++; + Z_ADDREF_P(prop); add_next_index_zval(arr, prop); set_zval_property(ret, (char*)trav->name, arr TSRMLS_CC); prop = arr; @@ -2843,7 +2843,7 @@ static zval *guess_zval_convert(encodeTypePtr type, xmlNodePtr data) object_init_ex(soapvar, soap_var_class_entry); add_property_long(soapvar, "enc_type", enc->details.type); #ifdef ZEND_ENGINE_2 - ret->refcount--; + Z_DELREF_P(ret); #endif add_property_zval(soapvar, "enc_value", ret); parse_namespace(type_name, &cptype, &ns); diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 40bba74d61..a868a41efe 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -994,7 +994,7 @@ try_again: if (digest != NULL) { php_url *new_url = emalloc(sizeof(php_url)); - digest->refcount--; + Z_DELREF_P(digest); add_property_zval_ex(this_ptr, "_digest", sizeof("_digest"), digest TSRMLS_CC); *new_url = *phpurl; diff --git a/ext/soap/php_packet_soap.c b/ext/soap/php_packet_soap.c index f2ab47c60a..c7b8c3260c 100644 --- a/ext/soap/php_packet_soap.c +++ b/ext/soap/php_packet_soap.c @@ -241,7 +241,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction } #ifdef ZEND_ENGINE_2 if (details) { - details->refcount--; + Z_DELREF_P(details); } #endif xmlFreeDoc(response); @@ -387,7 +387,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction zend_hash_internal_pointer_reset(Z_ARRVAL_P(return_value)); zend_hash_get_current_data(Z_ARRVAL_P(return_value), (void**)&tmp); tmp = *(zval**)tmp; - tmp->refcount++; + Z_ADDREF_P(tmp); zval_dtor(return_value); *return_value = *tmp; FREE_ZVAL(tmp); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 0024b03743..69e7226ab1 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2379,7 +2379,7 @@ PHP_METHOD(SoapClient, SoapClient) INIT_PZVAL(class_map); zval_copy_ctor(class_map); #ifdef ZEND_ENGINE_2 - class_map->refcount--; + Z_DELREF_P(class_map); #endif add_property_zval(this_ptr, "_classmap", class_map); } @@ -2795,7 +2795,7 @@ PHP_METHOD(SoapClient, __call) soap_headers = emalloc(sizeof(HashTable)); zend_hash_init(soap_headers, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_next_index_insert(soap_headers, &headers, sizeof(zval*), NULL); - ZVAL_ADDREF(headers); + Z_ADDREF_P(headers); free_soap_headers = 1; } else{ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid SOAP header"); @@ -2814,7 +2814,7 @@ PHP_METHOD(SoapClient, __call) } zend_hash_internal_pointer_reset(default_headers); while (zend_hash_get_current_data(default_headers, (void**)&tmp) == SUCCESS) { - ZVAL_ADDREF(*tmp); + Z_ADDREF_PP(tmp); zend_hash_next_index_insert(soap_headers, tmp, sizeof(zval *), NULL); zend_hash_move_forward(default_headers); } @@ -3060,9 +3060,9 @@ PHP_METHOD(SoapClient, __setSoapHeaders) zval *default_headers; ALLOC_INIT_ZVAL(default_headers); array_init(default_headers); - headers->refcount++; + Z_ADDREF_P(headers); add_next_index_zval(default_headers, headers); - default_headers->refcount--; + Z_DELREF_P(default_headers); add_property_zval(this_ptr, "__default_headers", default_headers); } else{ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid SOAP header"); @@ -3152,7 +3152,7 @@ zval* add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *faul ALLOC_INIT_ZVAL(fault); set_soap_fault(fault, NULL, fault_code, fault_string, fault_actor, fault_detail, NULL TSRMLS_CC); #ifdef ZEND_ENGINE_2 - fault->refcount--; + Z_DELREF_P(fault); #endif add_property_zval(obj, "__soap_fault", fault); return fault; |