andrei Mon Apr 17 16:08:08 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/soap php_encoding.c php_encoding.h php_sdl.c Log: Some encodings were assumed to be default and, thus, were not made persistent. http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.20&r2=1.103.2.21&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.20 php-src/ext/soap/php_encoding.c:1.103.2.21 --- php-src/ext/soap/php_encoding.c:1.103.2.20 Mon Apr 10 13:29:48 2006 +++ php-src/ext/soap/php_encoding.c Mon Apr 17 16:08:08 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.103.2.20 2006/04/10 13:29:48 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.21 2006/04/17 16:08:08 andrei Exp $ */ #include <time.h> @@ -211,6 +211,9 @@ {{END_KNOWN_TYPES, NULL, NULL, NULL}, guess_zval_convert, guess_xml_convert} }; +int numDefaultEncodings = sizeof(defaultEncoding)/sizeof(encode); + + void whiteSpace_replace(char* str) { while (*str != '\0') { http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.h?r1=1.38.2.2&r2=1.38.2.3&diff_format=u Index: php-src/ext/soap/php_encoding.h diff -u php-src/ext/soap/php_encoding.h:1.38.2.2 php-src/ext/soap/php_encoding.h:1.38.2.3 --- php-src/ext/soap/php_encoding.h:1.38.2.2 Sun Apr 9 23:35:51 2006 +++ php-src/ext/soap/php_encoding.h Mon Apr 17 16:08:08 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.h,v 1.38.2.2 2006/04/09 23:35:51 andrei Exp $ */ +/* $Id: php_encoding.h,v 1.38.2.3 2006/04/17 16:08:08 andrei Exp $ */ #ifndef PHP_ENCODING_H #define PHP_ENCODING_H @@ -222,5 +222,6 @@ void delete_encoder_persistent(void *handle); extern encode defaultEncoding[]; +extern int numDefaultEncodings; #endif http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.9&r2=1.88.2.10&diff_format=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.88.2.9 php-src/ext/soap/php_sdl.c:1.88.2.10 --- php-src/ext/soap/php_sdl.c:1.88.2.9 Mon Apr 17 13:16:02 2006 +++ php-src/ext/soap/php_sdl.c Mon Apr 17 16:08:08 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_sdl.c,v 1.88.2.9 2006/04/17 13:16:02 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.88.2.10 2006/04/17 16:08:08 andrei Exp $ */ #include "php_soap.h" #include "ext/libxml/php_libxml.h" @@ -2292,7 +2292,7 @@ { sdlTypePtr *tmp; - if (zend_hash_find(ptr_map, (char *)(*type), sizeof(sdlTypePtr), (void**)&tmp) == SUCCESS) { + if (zend_hash_find(ptr_map, (char *)type, sizeof(sdlTypePtr), (void**)&tmp) == SUCCESS) { *type = *tmp; } else { zend_hash_next_index_insert(bp_types, (void*)&type, sizeof(sdlTypePtr*), NULL); @@ -2305,11 +2305,11 @@ encodePtr *tmp; /* do not process defaultEncoding's here */ - if ((*enc)->details.sdl_type == NULL) { + if ((*enc) >= defaultEncoding && (*enc) < defaultEncoding + numDefaultEncodings) { return; } - if (zend_hash_find(ptr_map, (char *)(*enc), sizeof(encodePtr), (void**)&tmp) == SUCCESS) { + if (zend_hash_find(ptr_map, (char *)enc, sizeof(encodePtr), (void**)&tmp) == SUCCESS) { *enc = *tmp; } else { zend_hash_next_index_insert(bp_encoders, (void*)&enc, sizeof(encodePtr*), NULL); @@ -2513,7 +2513,7 @@ } /* we do not want to process defaultEncoding's here */ - if (pattr->encode && pattr->encode->details.sdl_type) { + if (pattr->encode) { make_persistent_sdl_encoder_ref(&pattr->encode, ptr_map, bp_encoders); } @@ -2625,7 +2625,7 @@ } /* we do not want to process defaultEncoding's here */ - if (ptype->encode && ptype->encode->details.sdl_type) { + if (ptype->encode) { make_persistent_sdl_encoder_ref(&ptype->encode, ptr_map, bp_encoders); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php