From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- ext/soap/php_encoding.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_encoding.h') diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index 31a8469390..5a8186ff74 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From c446e575880d503921a795ee7cc4126b8b84457b Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 15 May 2014 02:44:47 +0400 Subject: ext/soap support for phpng (incomplete - just compilable) --- ext/soap/php_encoding.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ext/soap/php_encoding.h') diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index 5a8186ff74..adcccd3612 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -183,23 +183,23 @@ struct _encodeType { struct _encode { encodeType details; - zval *(*to_zval)(encodeTypePtr type, xmlNodePtr data TSRMLS_DC); + zval *(*to_zval)(zval *ret, encodeTypePtr type, xmlNodePtr data TSRMLS_DC); xmlNodePtr (*to_xml)(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC); }; /* Master functions all encode/decode should be called thur these functions */ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr parent TSRMLS_DC); -zval *master_to_zval(encodePtr encode, xmlNodePtr data TSRMLS_DC); +zval *master_to_zval(zval *ret, encodePtr encode, xmlNodePtr data TSRMLS_DC); /* user defined mapping */ xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr parent TSRMLS_DC); -zval *to_zval_user(encodeTypePtr type, xmlNodePtr node TSRMLS_DC); +zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node TSRMLS_DC); void whiteSpace_replace(xmlChar* str); void whiteSpace_collapse(xmlChar* str); xmlNodePtr sdl_guess_convert_xml(encodeTypePtr enc, zval* data, int style, xmlNodePtr parent TSRMLS_DC); -zval *sdl_guess_convert_zval(encodeTypePtr enc, xmlNodePtr data TSRMLS_DC); +zval *sdl_guess_convert_zval(zval *ret, encodeTypePtr enc, xmlNodePtr data TSRMLS_DC); void encode_finish(); void encode_reset_ns(); @@ -207,8 +207,8 @@ xmlNsPtr encode_add_ns(xmlNodePtr node, const char* ns); encodePtr get_conversion(int encode); -void delete_encoder(void *handle); -void delete_encoder_persistent(void *handle); +void delete_encoder(zval *zv); +void delete_encoder_persistent(zval *zv); extern encode defaultEncoding[]; extern int numDefaultEncodings; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/soap/php_encoding.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/soap/php_encoding.h') diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index adcccd3612..4424116524 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1