diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-02-04 14:46:12 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-02-04 14:46:12 +0000 |
| commit | 9fa7d1c24aa8dd6130179da2eb2e0b37b6e4fd8d (patch) | |
| tree | 4066be9017b4609b6de1f903aad3ddbfec69d11f /ext/soap/php_encoding.c | |
| parent | 3df50001e132d2c634cebb2c336654c3211dac44 (diff) | |
| download | php-git-9fa7d1c24aa8dd6130179da2eb2e0b37b6e4fd8d.tar.gz | |
SOAP Headers was implemented (near complete)
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index dc8141ccfb..a0c9da9e45 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -249,22 +249,23 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par Z_OBJCE_P(data) == soap_var_class_entry) { zval **ztype, **zdata, **zns, **zstype, **zname, **znamens; encodePtr enc; + HashTable *ht = Z_OBJPROP_P(data); - if (zend_hash_find(Z_OBJPROP_P(data), "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { + if (zend_hash_find(ht, "enc_type", sizeof("enc_type"), (void **)&ztype) == FAILURE) { php_error(E_ERROR, "SOAP-ERROR: Encoding: SoapVar hasn't 'enc_type' propery"); } enc = get_conversion(Z_LVAL_P(*ztype)); - if (zend_hash_find(Z_OBJPROP_P(data), "enc_value", sizeof("enc_value"), (void **)&zdata) == FAILURE) { + if (zend_hash_find(ht, "enc_value", sizeof("enc_value"), (void **)&zdata) == FAILURE) { node = master_to_xml(enc, NULL, style, parent); } else { node = master_to_xml(enc, *zdata, style, parent); } if (style == SOAP_ENCODED) { - if (zend_hash_find(Z_OBJPROP_P(data), "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) { - if (zend_hash_find(Z_OBJPROP_P(data), "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) { + if (zend_hash_find(ht, "enc_stype", sizeof("enc_stype"), (void **)&zstype) == SUCCESS) { + if (zend_hash_find(ht, "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) { set_ns_and_type_ex(node, Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype)); } else { set_ns_and_type_ex(node, NULL, Z_STRVAL_PP(zstype)); @@ -272,10 +273,10 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par } } - if (zend_hash_find(Z_OBJPROP_P(data), "enc_name", sizeof("enc_name"), (void **)&zname) == SUCCESS) { + if (zend_hash_find(ht, "enc_name", sizeof("enc_name"), (void **)&zname) == SUCCESS) { xmlNodeSetName(node, Z_STRVAL_PP(zname)); } - if (zend_hash_find(Z_OBJPROP_P(data), "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS) { + if (zend_hash_find(ht, "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS) { xmlNsPtr nsp = encode_add_ns(node, Z_STRVAL_PP(znamens)); xmlSetNs(node, nsp); } @@ -2307,7 +2308,7 @@ static xmlNodePtr check_and_resolve_href(xmlNodePtr data) { if (data && data->properties) { xmlAttrPtr href; - + href = data->properties; while (1) { href = get_attribute(href, "href"); |