diff --git a/README.md b/README.md index fabf7c9..52f3af6 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,7 @@ Copy of original library for supporting packagist composer. More info at project webite http://nusoap.sourceforge.net/ +This fork provides latest official sources taken form sourceforge VCS +and merged with deviservi/nusoap changes + diff --git a/lib/changelog b/lib/changelog index 78414bd..46d1236 100644 --- a/lib/changelog +++ b/lib/changelog @@ -1,653 +1,705 @@ -2003-07-21, version 0.6.5 -- soap_transport_http: SOAPAction header is quoted again, fixes problem w/ Weblogic Server -- applied Jason Levitt patch for proper array serialization, fixes problem w/ Amazon shopping cart services -- fixed null value serialization -- applied patch from "BZC ToOn'S" - fixes wsdl serialization when no parameters -- applied John's patch, implementing compression for the server - -2003-07-22, version 0.6.5 -- soap_server: fixed bug causing charset encoding not to be passed to the parser -- soap_fault: added default encoding to the fault serialization -- soap_parser: changed the parser to pre-load the parent's result array when processing scalar values. This increases parsing speed. - -2003-07-23, version 0.6.5 -- soap_base: fix code that overwrites user-supplied attributes in serialize_val -- soap_base: use arrays-of-arrays rather than attempting multi-dimensional in serialize_val -- xmlschema: emit import statements and qualify all elements with prefix in serializeSchema (better interop with validation tools) -- soapclient: get xml character encoding from HTTP Content-Type header if provided, e.g. text/xml;charset="UTF-8" -- soapclient: use headers in call if provided (previously ignored this parameter) -- soap_server: in parse_request, if neither getallheaders nor $_SERVER are available, use $HTTP_SERVER_VARS to get SOAPAction and xml encoding - -2003-07-24, version 0.6.5 -- soap_transport_http: apply patch from Steven Brown "if the server closes connection prematurely, nusoap would spin trying to read data that isn't there" - -2003-07-25, version 0.6.5 -- wsdl: apply patch from Sven to workaround single schema limitation -- wsdl: apply a variant of the patch from Holger to handle empty values for array by serializing an array with 0 elements -- xmlschema: remove the redundant default namespace attribute on the schema element; everything in xsd is explicitly specified as being from xsd -- soap_transport_http: fix setCredentials and add TODO comments in sendHTTPS about what to change if this setCredentials stays - -2003-07-30, version 0.6.5 -- nusoap_base: change documentation of soap_defencoding to specify it is the encoding for outgoing messages -- nusoap_base: only change &, <, > to entities, not all HTML entities -- soap_transport_http: update the Content-Type header in sendRequest, since soap_defencoding could be changed after ctor is called -- soap_server: use soap_defencoding instead of charset_encoding -- soap_server: read encoding from _SERVER if available -- nusoap_base: do entity translation for string parameters with an xsd type specified (thanks David Derr) - -2003-07-31, version 0.6.5 -- soap_transport_http: add proxy authentication -- soap_transport_http: build payload the same way for http and https -- wsdl: add proxy authentication -- soapclient: add proxy authentication -- soapclient: allow proxy information in ctor, so that it can be used for wsdl - -2003-08-01, version 0.6.5 -- soap_transport_http: close a persistent connection that's at EOF -- soap_transport_http: prevent conflicts between setEncoding and usePersistentConnection -- soap_transport_http: fix use of $headers instead of $this->incoming_headers in getResponse -- soapclient: improve handling of persistent connections -- soapclient: force xml_encoding to upper case -- soap_server: let the Web server decide whether to close the connection (no Connection: close header) -- soap_server: force xml_encoding to upper case - -2003-08-04, version 0.6.5 -- soap_parser: use XML type information to pick a PHP data type; also decode base64 -- soap_server: read all HTTP headers when using _SERVER or HTTP_SERVER_VARS -- soap_server: add gzip encoding support for outgoing messages -- soap_transport_http: deflate is gzcompress/gzuncompress (cf. http://archive.develooper.com/libwww@perl.org/msg04650.html) -- soap_transport_http: clean use of persistentConnection so it's always a set boolean -- soapclient: add responseData member to access deflated/gunzipped payload - -2003-08-05, version 0.6.5 -- soap_server: look multiple places when setting debug_flag - -2003-08-07, version 0.6.5 -- nusoap_base: serialize specified type (e.g. ArrayOfString) even for simple array -- wsdl: only specify encodingStyle in the input/output soap bindings when it is not empty (thanks Guillaume) - -2003-08-15, version 0.6.5 -- soap_parser: fix parsing of elements with no XSD type specified -- soap_parser: use PHP string type for XSD long and unsignedLong types - -2003-08-16, version 0.6.5 -- soap_parser: fix code generating warning (thanks Torsten) - -2003-08-19, version 0.6.5 -- soap_parser: fix another line of code generating a warning (thanks Torsten) - -2003-08-22, version 0.6.5 -- soap_server: remove all '--' from debug_str; previous code changed '---' to '- --' -- wsdl, soapclient, soap_parser: patch submitted by Mark Spavin as described by - the following... -> Changes for the multiple/nested imports from the wsdl file. This builds an -> array of files not just the last one and also checks for relative paths to -> the parent. This will then get the imported files from the remote site -> instead of your local disk. Local wsdl files should still work (untested). -> -> Changes for multiple encoding sytles as previously posted - -2003-08-24, version 0.6.5 -- wsdl, soapclient: fix some PHP notices from previous update - -2003-08-26, version 0.6.5 -- wsdl: support multiple SOAP ports -- soapclient, soap_server: when no charset is specified, use UTF-8, even though HTTP specifies US-ASCII. -- soap_transport_http: do not prepend $host with 'ssl://' for https (is this required for older cURL versions?) - -2003-08-27, version 0.6.5 -- soap_server: support compressed request messages (thanks John Huong) -- soap_parser: deserialize Apache Vector as an array -- xmlschema: use $this->typemap in getPHPType (which is not used) -- soapclient, wsdl: check for WSDL errors after serializing parameters -- nusoap_base: add serialization of Apache Map (when not using WSDL) -- wsdl: add serialization of Apache Map (when using WSDL) -- wsdl: only change &, <, > to entities, not all HTML entities - -2003-08-28, version 0.6.5 -- soap_transport_http: disable cURL verification of peer and server (formerly the cURL default) -- soap_transport_http: mingle cURL code with straight http, so sendHTTP is no longer needed - -2003-08-29, version 0.6.6 -- soap_transport_http: add setContentType -- soapclient: call setContentType using new getHTTPContentType and getHTTPContentTypeCharset - -2003-09-05, version 0.6.6 -- wsdl: add some more code to handle null/nil values (but there's still a way to go) - -2003-10-21, version 0.6.6 -- soap_transport_http: only include port in Host header if it was specified in the URL -- soap_transport_http: add some code to use OpenSSL for PHP ssl:// scheme, but comment out since it's not ready -- soap_server: use $_SERVER['PHP_SELF'] if $GLOBALS['PHP_SELF'] is not set -- wsdl: add WSDL request and response and transport debug to debug -- wsdl: handle custom type extending xmlschema namespace (GLUE ... Thanks Matt) -- soap_parser: add param to docs -- soapclient: add getHTTPBody, getHTTPContentType, getHTTPContentTypeCharset (anticipating MIME subclass) - -2003-10-28, version 0.6.6 -- nusoap_base: add expandEntities method -- wsdl: use expandEntities -- soap_fault: use expandEntities -- soap_transport_http: Allow credentials to be included in URL, rather than requiring setCredentials -- soap_transport_http: Merge HTTP headers that span multiple lines -- soap_parser: Properly set errors in ctor -- soapclient: Pass headers to parseResponse and parse them in that method - -2003-10-30, version 0.6.6 -- xmlschema: Add some information for the related type to an element - -2003-12-09, version 0.6.6 -- nusoap_base: Add some namespace methods previously in xmlschema -- xmlschema: Improve parsing of complexType, element and simpleType -- xmlschema: Improve serialization -- xmlschema: Track imports -- xmlschema: Track elementFormDefault and form attributes -- wsdl: Support multiple (note that setting $server->wsdl->schemaTargetNamespace no longer does anything! Use configureWSDL instead.) -- wsdl: Use form attribute of element to control namespace specification -- wsdl: Support chained imports (A imports B which imports C) -- wsdl: Include port in endpoint address when serializing -- soap_server: Fix use of style (rpc|document) and use (encoded|literal) -- soap_server: Support _SERVER[CONTENT_TYPE] in addition to _SERVER[HTTP_CONTENT_TYPE] -- soap_server: Support wsdl with multiple -- soap_client: Remove a var_dump -- soap_client: Add style and use parameters to call method to support doc/lit without WSDL -- soap_transport_http: Check that $this->fp exists when doing persistent connections - -2003-12-17, version 0.6.6 -- soap_server: pass namespaces to xmlschema constructor -- wsdl: post-process after all imports -- wsdl: remove some debug, add some error handling -- xmlschema: allow enclosing namespaces to be specified in constructor -- xmlschema: improve handling of compositors and simple types - -2004-01-08, version 0.6.6 -- soap_server: when requested WSDL is in a file, return to client using passthru (thanks Ingo Fischer) -- soapclient: have proxy inherit more client state -- soapclient: allow timeout and response timeout to be specified in the constructor -- wsdl: allow timeout and response timeout to be specified in the constructor -- soap_transport_http: allow response timeout to be specified in send and sendHTTPS - -2004-01-28, version 0.6.6 -- wsdl: add namespace for array and scalar when form is qualified -- wsdl: fix a bug in which data type of complexType elements were ignored in serialization -- wsdl: enhance handling of URLs with file scheme -- wsdl: add addSimpleType -- xmlschema: add addSimpleType -- xmlschema: always set phpType elements -- soapclient: allow a wsdl instance to be specified in constructor -- soap_server: allow a wsdl instance to be specified in constructor (not tested!) -- soap_server: fix default SOAPAction created in register method -- soap_transport_http: accept chunking with LF separators in addition to CRLF. -- wsdlcache: added class -- nusoapmime: fix comments - -2004-02-23, version 0.6.6 -- soap_transport_http: don't try to unchunk cURL data, since cURL already does it -- soap_transport_http: append CVS revision to version in User-Agent -- wsdl: serialize boolean as true|false, not 1|0, to agree with XML Schema -- soap_server: always exit() after returning WSDL -- soap_server: use the WSDL URL scheme as the default endpoint URL scheme -- soap_server: append CVS revision to version in X-SOAP-Server -- nusoap_base: add (CVS) revision -- wsdlcache: synchronize using a per-WSDL lock file (Thanks Ingo) -- wsdlcache: add cache lifetime, after which cache contents are invalidated (Thanks Ingo) - -2004-03-15, version 0.6.6 -- nusoap_base: add isArraySimpleOrStruct method -- soap_server: improve WSDL URL scheme determination -- soap_server: only deflate/gzip payloads > 1024 bytes -- soap_server: fix parameter order in fault method (always used as faultcode, faultstring) -- soap_server: refactor parse_request into multiple functions (for sanity) -- soap_server: set the namespace on the Response element to the same as the request -- soap_server: name the return value element 'return' by default -- soap_server: added and documented data fields, so that service programmers can use them if desired -- soap_parser: standardize parsing error message -- soap_parser: fix document and responseHeaders so they are the correct XML text (as documented) -- soap_transport_http: fix read from persistent connection -- soapclient: clean up debugging for persistent connection -- wsdl: enforce correct naming of messages parts when an associative array is used for parameters -- wsdl: better serialization of null values -- wsdl: standardize parsing error message -- xmlschema: standardize parsing error message - -2004-03-24, version 0.6.7 -- soap_transport_http: add digest authentication (based on code by Kevin A. Miller) -- xmlschema: improve parsing of import elements -- wsdl: do schema imports even if there are no wsdl imports - -2004-04-12, version 0.6.7 -- wsdl: serialize multiple elements when maxOccurs="unbounded" and value is an array -- wsdl: serialize soapval values (used to force an XML type, e.g. when WSDL uses an abstract type) -- nusoapmime: do not require nusoap.php (it is now the programmer's responsibility) - -2004-04-21, version 0.6.7 -- soap_parser: parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element) -- soap_server: do not wrap response in a response element for a document style service - -2004-04-30, version 0.6.7 -- soap_transport_http: allow digest auth params to be separated by "," as well as ", " -- soap_transport_http: re-initialize incoming headers for each response -- soap_server: add methodreturnisliteralxml property to allow service function to return XML as a string -- soapclient: improve rpc/literal support -- soapclient: allow XML string as call params in addition to array -- soapclient: support document style and literal encoding when not using WSDL - -2004-05-05, version 0.6.7 -- wsdl: serialize PHP objects for WSDL XML Schema complexTypes, in addition to associative arrays -- wsdl: fix WSDL generation when there is no encodingStyle -- soap_transport_http: suppress fsockopen warnings -- soap_transport_http: detect socket timeouts when reading (0 bytes returned) -- soap_transport_http: read chunked content "in-line" so it works on a persistent connection -- nusoap_base: serialize boolean as true|false, not 1|0, to agree with XML Schema -- nusoap_base: serialize array of struct differently than array of array - -2004-06-25, version 0.6.8 -- soap_server: prefer gzip to deflate, since IE does not like our deflate -- soap_server: move webDescription to the wsdl class -- soap_server: allow class and instance method calls for service (thanks Ingo Fischer and Roland Knall) -- wsdl: get webDescription from the soap_server class -- wsdl: allow compression from the server -- wsdl: fix serialization of soapval without a type -- wsdl: propagate debug value from query string to SOAP endpoint in programmatic WSDL generation -- nusoap_base: add anyType, anySimpleType for 2001 XML Schema -- nusoap_base: provide additional debug functions -- soap_transport_http: ignore Content-Length when chunked encoding is used -- soap_transport_http: remove ':' from username for Basic authentication (cf. RFC 2617) -- soap_transport_http: urldecode username and password taken from URL -- soap_transport_http: use raw inflate/deflate for IE/IIS compatibility, rather than having Zlib headers according to HTTP 1.1 spec -- soap_transport_http: attempt to handle the case when both the service application and Web server compress the response -- soapclient: when creating proxy methods, replace '.' in operation name with '__' in function name -- soapclient: initialize requestHeaders in proxy -- general: use new debug methods; never access debug_str directly - -2004-09-30, version 0.6.8 -- soapclient: do not allow getProxy call when WSDL is not used -- soapclient: use ISO-8859-1 as the charset if not specified in the Content-Type header -- soapclient: when an empty string is specified for the call namespace, do not put the method element in a namespace -- soapclient: let soap_transport_http check for SSL support -- soapclient: have proxy inherit soap_defencoding from the client from which it is generated -- soapclient: do not assume that 'ns1' is an unused namespace prefix; always generate namespace prefixes randomly -- soap_parser: compare any encoding in the XML declaration to the charset from the HTTP Content-Type header (thanks Ingo Fischer) -- soap_parser: improve parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element) -- soap_server: use ISO-8859-1 as the charset if not specified in the Content-Type header -- soap_server: allow suppression of automatic UTF-8 decoding -- soap_server: fix a bug when call_user_func_array() is used -- soap_transport_http: correct digest authentication through a proxy -- wsdl: serialize SOAP-ENC types similarly to XSD types -- xmlschema: force unprefixed type into default namespace -- xmlschema: fix serialization of definition of simple types - -2004-10-01, version 0.6.8 -- soap_parser: handle default namespace attributes -- soap_server: add default_utf8 field -- soap_server: support literal encoding (with RPC style) -- soap_transport_http: parse HTTP status and generate error for 300, 302-307, 400, 401-417, 501-505 (thanks for the idea Ghislain) -- soap_transport_http: follow HTTP redirection (HTTP status 301 and Location header) (thanks for the idea Ghislain) -- xmlschema: allow any attributes to be specified in an element of a complexType, e.g., abstract, default, form, minOccurs, maxOccurs, nillable (thanks Jirka Pech for the original patch) - -2004-10-02, version 0.6.8 -- soapclient: read/write cookies (thanks Ingo) -- soap_server: change faultcode on non-resendable faults to Client -- soap_transport_http: read/write cookies (thanks Ingo) - -2004-10-05, version 0.6.8 -- wsdl: add addElement method -- wsdl: support the document style in the register method -- xmlschema: parse unnamed simpleTypes, rather than ignoring them -- xmlschema: include untyped elements when parsing a complexType -- xmlschema: add addElement method - -2004-10-14, version 0.6.8 -- soapclient: support client certificates -- soap_parser: deserialize attributes, prefixing names with "!" -- soap_server: notify the client with HTML when WSDL is requested but not supported by service -- soap_transport_http: support client certificates -- wsdl: support defaults for elements of a complexType -- wsdl: serialize elements from complexType extension base -- wsdl: serialize data (associative array elements) as attributes according to XML Schema -- xmlschema: record extension base if present for a complexType - -2004-12-15, version 0.6.8 -- nusoap_base: add 2000 XML Schema (rare, but used by Akamai) -- soap_parser: avoid deserializing more common attributes that are not data -- soap_parser: be lax when HTTP specifies ISO-8859-1 (the default) and XML specifies UTF-8 (the norm) -- soap_server: account for the fact that get_class_methods returns methods in all lower case (thanks Steve Haldane) -- soap_transport_http: parse digest info that includes '=' in the data (thanks Jinsuk Kim) -- wsdl: feably handle some cases for literal serialization of form="unqualified" elements -- wsdl: don't serialize the decimal portion of a PHP double when the XML type is long -- wsdl: fix serialization of attributes for complexType that is an extension -- wsdlcache: enhance diagnostics -- xmlschema: handle untyped elements -- xmlschema: handle WSDL for SOAP Array that uses the base attribute plus a sequence of element - -2005-01-22, version 0.6.8 -- wsdl: allow an element in one schema to have a type from another schema - -2005-01-24, version 0.6.8 -- xmlschema: correctly parse nested complexType definitions - -2005-02-14, version 0.6.8 -- nusoap_base: fix a bug in which attributes were sometimes not serialized with a value -- nusoap_base: improve serialization of null values (thanks Dominique Stender) -- soap_parser: parse null values by handling the nil attribute (thanks Dominique Stender) -- soap_server: set character encoding for a fault to be the same as for the server (thanks Mark Scott) -- soap_server: correctly check for null value returned from method when WSDL is used (without WSDL, cannot distinguish whether NULL or void return is desired) -- soapclient: for document style, call should always return an array rooted at the response part (all bets are off when there are multiple parts) -- xmlschema: save enumeration values parsed from WSDL - -2005-02-10, version 0.6.9 -- soapclient: only set SOAP headers when they are specified in call params (so setHeaders still works) - -2005-04-04, version 0.6.9 -- soap_server: use get_class instead of is_a (thanks Thomas Noel) -- soapclient: use get_class instead of is_a (thanks Thomas Noel) -- soapclient: add setEndpoint method -- soap_transport_http: fix client certificates (thanks Doug Anarino and Eryan Eriobowo) - -2005-04-29, version 0.6.9 -- nusoap_base: add global variable and methods for setting debug level -- nusoap_base: use xsd:anyType instead of xsd:ur-type to serialize arrays with multiple element types (thanks Ingo Fischer) -- nusoap_base: expand entities in attributes (thanks Gaetano Giunta) -- soapclient: call parent constructor -- soapval: call parent constructor -- soap_fault: call parent constructor -- soap_parser: call parent constructor -- soap_server: assume get_class_methods always returns lower case for PHP 4.x only -- soap_server: call parent constructor -- soap_transport_http: do nothing in setEncoding if gzdeflate is not present (thanks Franck Touanen for pointing this out) -- soap_transport_http: fix check for server request for digest authentication (thanks Mark Spavin) -- soap_transport_http: call parent constructor -- wsdl: fix documentation page popup of one method after another (thanks Owen) -- wsdl: call parent constructor -- wsdl: expand entities in attributes (thanks Gaetano Giunta) -- xmlschema: call parent constructor - -2005-06-03, version 0.6.9 -- nusoap_base: serialize empty arrays as having elements xsd:anyType[0] -- nusoap_base: add encodingStyle parameter to serializeEnvelope -- nusoap_base: serialize xsi:type with nil values -- nusoap_base: improve debug and comments -- soap_parser: correctly parse an empty array to an empty array, not an empty string -- soap_parser: improve debug and comments -- soap_server: specify encodingStyle for envelope when WSDL is used -- soapclient: factor out new getProxyClassCode method -- soapclient: specify encodingStyle for envelope -- soapclient: improve debug and comments -- wsdl: add namespace for Apache SOAP types if a variable of such type is serialized -- wsdl: serialize nil value for nillable elements when no value is provided -- wsdl: serialize xsi:type with nil values -- wsdl: copy attributes as well as elements to an element from its complexType -- wsdl: specify encodingStyle for operations -- wsdl: improve debug and comments -- xmlschema: improve debug and comments - -2005-06-03, version 0.7.0 -- nusoap_base: improve debug and comments -- nusoap_base: fix version, which should have been 0.7.0 since 2005-03-04 - -2005-06-06, version 0.7.1 -- nusoap_base: adjust numeric element names for serialization, instead of forcing them to 'soapVal' -- nusoapmime: add type=text/xml to multipart/related (thanks Emmanuel Cordonnier) -- soap_fault: fix serialization of detail -- soap_server: check required parameters for register method -- soap_server: when getallheaders is used, massage header names -- soap_server: use SOAPAction to determine operation when doc/lit service does not wrap parameters in an element with the method name (thanks Peter Hrastnik) -- soap_transport_http: correctly handle multiple HTTP/1.1 100 responses for https (thanks Jan Slabon) -- wsdl: fixed documentation for addComplexType (thanks Csintalan Ádám) -- wsdl: serialize array data when maxOccurs = 'unbounded' OR maxOccurs > 1 (thanks Dominique Schreckling) -- wsdl: when serializing a string == 'false' as a boolean, set the value to false -- wsdl: when serializing a complexType, require the PHP value supplied to be an array - -2005-07-01, version 0.7.1 -- nusoap_base: Allow SOAP headers to be supplied as an array like parameters -- soap_parser: de-serialize simpleContent that accompanies complexContent -- soap_server: append debug information when programmatically-defined WSDL is returned -- soap_transport_http: Add debug when an outgoing header is set -- soapclient: Allow SOAP headers to be supplied as an array like parameters -- xmlschema: serialize attributes more generally, rather than assuming they are for SOAP 1.1 Array -- wsdl: when serializing, look up types by namespace, not prefix (simple programmatic doc/lit WSDL now seems to work) -- wsdl: process namespace declarations first when parsing an element - -2005-07-27, version 0.7.1 -- nusoap_base: do not override supplied element name with class name when serializing an object in serialize_val -- nusoap_base: remove http://soapinterop.org/xsd (si) from namespaces array -- nusoapmime: add nusoapservermime class to implement MIME attachments on the server -- soap_fault: improve documentation -- soap_server: improve documentation -- soap_server: make consistent use of _SERVER and HTTP_SERVER_VARS -- soap_server: make all incoming HTTP header keys lower case -- soap_server: add hook functions to support subclassing for MIME attachments -- soap_transport_http: remove an unnecessary global statement -- soapclient: when creating a proxy, make $params within each function an associative array -- soapval: improve documentation -- wsdl: when serializing complexType elements, used typed serialization if there is either a type or a reference for the element -- wsdl: allow PHP objects to be serialized as SOAP structs in serializeType -- wsdl: for WSDL and XML Schema imports, don't forget to use the TCP port number (thanks Luca GIOPPO) -- wsdl: make consistent use of _SERVER and HTTP_SERVER_VARS -- xmlschema: improve documentation - -2005-07-31, version 0.7.2 -- nusoap_base: correctly serialize attributes in serialize_val (thanks Hidran Arias) -- soap_parser: when resolving references, do not assume that buildVal returns an array (thanks Akshell) -- soap_parser: removed decode_entities, which does not work (thanks Martin Sarsale) -- soap_server: fix a bug parsing headers from _SERVER and HTTP_SERVER_VARS (thanks Bert Catsburg) -- soap_server: parse all "headers" from HTTP_SERVER_VARS (not just HTTP_*) -- soap_server: use PHP_SELF instead of SCRIPT_NAME for WSDL endpoint -- soap_server: when generating a fault while debug_flag is true, put debug into faultdetail -- wsdl: add enumeration parameter to addSimpleType -- xmlschema: add enumeration parameter to addSimpleType - -2006-02-02, version 0.7.2 -- soapclient: initialize paramArrayStr to improve proxy generation -- soap_parser: handle PHP5 soapclient's incorrect transmission of WSDL-described SOAP encoded arrays. -- soap_server: don't assume _SERVER['HTTPS'] is set; try HTTP_SERVER_VARS['HTTPS'] if it is not -- soap_server: "flatten out" the parameter array to call_user_func_array (thanks André Mamitzsch) -- soap_server: make thrown exceptions conform to specs -- wsdl: use serialize_val to serialize an array when the XSD type is soapenc:Array (JBoss/Axis does this) -- wsdl: change formatting of serialized XML for the WSDL -- xmlschema: change formatting of namespaces when serializing XML for the schema - -2006-04-07, version 0.7.2 -- soap_server: if methodparams is not an array, call call_user_func_array with an empty array (thanks Eric Grossi) -- wsdl: distinguish parts with element specified from those with type specified by suffixing element names with ^ -- wsdl: do a case-insensitive match on schema URI when looking for type -- xmlschema: only get element (not type) when name has ^ suffix - -2006-05-16, version 0.7.2 -- soapclient: add getHeader to get parsed SOAP Header -- soap_parser: check status when receiving Header or Body element -- soap_parser: add soapheader -- soap_server: add requestHeader with parsed SOAP Header - -2006-06-15, version 0.7.2 -- wsdl: fix bug in addComplexType (thanks Maarten Meijer) -- soap_transport_http: change cURL message - -2007-03-19, version 0.7.2 -- soapclient: declare as nusoapclient, then also subclass soapclient if SOAP extension not loaded -- soapclientmime: declare as nusoapclientmime, then also subclass soapclientmime if SOAP extension not loaded - -2007-03-28, version 0.7.2 -- nusoap_base: fix serialization of a soapval when its value is a soapval -- soapval: fix serialization of a soapval when its value is a soapval -- soapval: add __toString (cf. http://article.gmane.org/gmane.comp.php.nusoap.general/2776) -- nusoapclient: use lazy retrieval of WSDL instead of always getting it in the constructor -- nusoapclient: fix getProxy that was broken in last revision -- wsdl: add ability to set authorization credentials and retrieve WSDL outside of constructor - -2007-04-05, version 0.7.2 -- nusoapclientmime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman) -- nusoapclientmime: obey RFC 2045 Section 5.1 (thanks Chris Butler) -- nusoapservermime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman) -- nusoapservermime: obey RFC 2045 Section 5.1 (thanks Chris Butler) -- nusoap_base: remove extra whitespace from some XML elements -- nusoap_base: allow SOAP headers to be specified as an associative array (thanks Unique) -- nusoap_base: implement __toString -- nusoap_base: improve doc accuracy and consistency (thanks Martin K?gler) -- iso8601_to_timestamp: avoid problem with negative hours after calculation, etc. (thanks Guntram Trebs) -- nusoapclient: support user-settable cURL options (thanks Ciprian Popovici) -- nusoapclient: call SOAP 1.2 binding operations if no SOAP 1.1 present (there is no reason to believe this will always work!) -- nusoapclient: improve doc accuracy and consistency (thanks Martin K?gler) -- soap_server: don't try to use eval to call function when any parameter is an object -- soap_server: don't print return value within debug string; returned objects would need __toString in PHP 5.2 -- soap_server: use URL scheme for WSDL access as the scheme in SOAPAction -- soap_server: strip port number from server name (some FastCGI implementations include port in server name) -- soap_transport_http: support user-settable cURL options (thanks Ciprian Popovici) -- soap_transport_http: use cURL for NTLM authentication -- soap_transport_http: make digest authentication work for GET as well as POST -- soap_transport_http: improve doc accuracy and consistency (thanks Martin K?gler) -- soapval: remove __toString -- wsdl: set operation style if necessary, but do not override one already provided (thanks Raffaele Capobianco) -- wsdl: check SOAP 1.2 binding operations if no SOAP 1.1 present -- wsdl: improve doc accuracy and consistency (thanks Martin K?gler) -- xmlschema: fix simpleType serialization -- xmlschema: improve doc accuracy and consistency (thanks Martin K?gler) - -2007-04-09, version 0.7.2 -- nusoapclient: set decode_utf8 when creating a proxy (thanks Dmitri Dmitrienko) -- nusoapclient: rename class to nusoap_client -- soap_fault: also provide a class named nusoap_fault -- soap_parser: also provide a class named nusoap_parser -- soap_server: also provide a class named nusoap_server -- soap_transport_http: skip HTTP responses 301 and 401 when using cURL -- soap_transport_http: don't force HTTP Connection header when using cURL -- soap_transport_http: don't set HTTP Host and Content-Length headers when using cURL -- soap_transport_http: support CURLOPT_SSLCERTPASSWD (thanks David Blanco) -- wsdl: support user-settable cURL options (thanks Ciprian Popovici) -- wsdl: serialize parameters for non-SOAP 1.1 binding operations (there is no reason to believe this will always work!) -- xmlschema: also provide a class named nusoap_xmlschema -- nusoapclientmime: rename class to nusoap_client_mime -- nusoapservermime: rename class to nusoap_server_mime - -2007-04-11, version 0.7.2 -- nusoap_client: enable cURL usage to be forced (thanks Giunta Gaetano) -- soap_transport_http: enable cURL proxy usage (thanks Giunta Gaetano) -- soap_transport_http: enable cURL usage to be forced (thanks Giunta Gaetano) -- soap_transport_http: use cURL's HTTP authentication options for basic, digest -- wsdl: enable cURL usage to be forced (thanks Giunta Gaetano) - -2007-04-12, version 0.7.2 -- nusoap_client: add debug -- nusoap_xmlschema: don't add elements of complexTypes to elements array (thanks Heiko Hund) -- soap_transport_http: set cURL connection timeout if supported -- soap_transport_http: add debug when setting cURL option -- soap_transport_http: fix digest authentication broken in previous revision -- wsdl: add debug -- wsdlcache: address some issues with non-existing cache-files and PHP Warnings which came in such cases (thanks Ingo Fischer) -- wsdlcache: change class name to nusoap_wsdlcache - -2007-04-13, version 0.7.2 -- wsdl: wrap parameters if unwrapped values are supplied and WSDL specifies Microsoft-style wrapping - -2007-04-16, version 0.7.2 -- nusoap_base: avoid warning in getDebugAsXMLComment -- nusoap_client: small debug change -- nusoap_client_mime: set responseData when the root part is found - -2007-04-17, version 0.7.2 -- soap_transport_http: improve detection of undefined cURL options (thanks Ingo Fischer) - -2007-05-28, version 0.7.2 -- soap_transport_http: support digest authentication opaque feature (cf. RFC 2617) (thanks Daniel Lacroix) -- soap_transport_http: check safe_mode and open_basedir before setting CURLOPT_FOLLOWLOCATION -- soap_transport_http: skip "HTTP/1.0 200 Connection established" header when cURL returns it (thanks Raimund Jacob) -- nusoap_client: improve handling when getProxy is called and WSDL is not being used -- nusoap_base: add comments about which specifications are used/implemented by NuSOAP -- nusoap_xmlschema: create names for unnamed types that are unique by scope within XML Schema - -2007-06-11, version 0.7.2 -- wsdl: wrap return value if unwrapped value is supplied and WSDL specifies Microsoft-style wrapping - -2007-06-22, version 0.7.2 -- nusoap_xmlschema: fix serialization of simpleType restriction (thanks Rizwan Tejpar) - -2007-07-30, version 0.7.2 -- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) -- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) - -2007-10-21, version 0.7.2 -- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) -- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) - -2007-10-26, version 0.7.2 -- nusoap_server: Fix munging of _SERVER variables that start with HTTP_ (thanks Thomas Wieczorek) - -2007-10-30, version 0.7.2 -- nusoap_xmlschema: Serialize values for elementFormDefault, attributeFormDefault -- wsdl: Improve consistency between doc/lit schema auto-wrapping and client's parsed schema -- nusoap_server: Correct bug that placed encodingType in Envelope for doc/lit -- nusoap_server: Specify elementFormDefault for schema within doc/lit wsdl - -2007-10-31, version 0.7.2 -- wsdl: Fix typo in parametersMatchWrapped (thanks Sam Stepanyan) -- soap_transport_http: Fix three typos in setProxy (thanks Sam Stepanyan) -- nusoap_xmlschema: Fix typo in serializeTypeDef (thanks Sam Stepanyan) - -2007-11-06, version 1.0rc1 -- wsdl: Improve handling of return values from doc/lit methods -- nusoap_server: Handle case when method is not in a namespace - -2007-11-27, version 1.0rc1 -- nusoap_server: always try to invoke service for a POST -- nusoap_server: only return Location: for WSDL at http://... -- nusoap_base: change some syntax associated with globalDebugLevel - -2008-01-08, version 1.0rc1 -- nusoap_server: fix a typo where = was used instead of == (thanks J. (Johan) Bosma) - -2008-01-10, version 1.0rc1 -- nusoap_client: handle case where request or response has no content-type header (thanks Ingo Fischer) -- nusoap_server: handle case where request or response has no content-type header (thanks Ingo Fischer) -- wsdl: change CSS for .title in webDescription (thanks Marcus Uy) - -2008-01-25, version 1.0rc1 -- nusoap_xmlschema: when an element is of a complexType that is an extension, copy extensionBase from the type -- nusoap_xmlschema: do not apply elementFormDefault to globally defined elements - -2008-02-11, version 1.0rc1 -- wsdl: internally set form of wrapped parameter elements to unqualified (so server handles correctly) - -2008-03-03, version 1.0.rc1 -- nusoap_xmlschema: fix extension when base type has no explicit prefix -- nusoap_xmlschema: support XML Schema include -- wsdl: improve support for sequence by serializing inherited attributes and elements first - -2008-03-04, version 1.0.rc1 -- wsdl: allow WSDL port name to be specified in getOperations -- nusoap_client: allow WSDL port name to be specified in ctor - -2008-03-06, version 1.0rc1 -- wsdl: fix some port name variable references -- nusoap_base: change comments regarding preferred mode of support -- wsdl2nusoap: initial revision - -2008-03-14, version 1.0rc1 -- nusoap_base: fix timezone offset in timestamp_to_iso8601 (thanks Mario Trojan) - -2008-03-27, version 1.0rc1 -- nusoap_server: fix bug setting encodingStyle in serialize_return (thanks Luca Gobbo) - -2008-05-15, version 1.0rc1 -- nusoap_parser: handle case where Header or Body tags are used within SOAP messages (thanks Sergey Zhuravlev) - -2008-08-26, version 1.0rc1 -- wsdl: serialize simpleContent for complexType -- wsdl: avoid serializing complexType elements with no value and minOccurs = 0 regardless of nillability - -2010-04-26, version 0.9.5 -- nusoap_xmlschema: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- wsdl: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- soap_transport_http: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- soap_transport_http: remove call to deprecated function set_magic_quotes_runtime -- nusoap_server: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- nusoap_server: check that value is an object before calling get_class (thanks Pier-Luc Duchaine) -- nusoap_parser: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- nusoap_client: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- nusoap_client: do not assign the return value of new by reference (it is deprecated) (thanks Pier-Luc Duchaine) -- nusoap_base: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) -- nusoapmime: do not assign the return value of new by reference (it is deprecated) - -2011-11-25, version 0.9.6 -- class.wsdl.php: fixed Warning attempt to modify property of non-object at nusoap.php on line 4151. -- nusoap.php: fixed Warning attempt to modify property of non-object at nusoap.php on line 4151. - +2003-07-21, version 0.6.5 +- soap_transport_http: SOAPAction header is quoted again, fixes problem w/ Weblogic Server +- applied Jason Levitt patch for proper array serialization, fixes problem w/ Amazon shopping cart services +- fixed null value serialization +- applied patch from "BZC ToOn'S" - fixes wsdl serialization when no parameters +- applied John's patch, implementing compression for the server + +2003-07-22, version 0.6.5 +- soap_server: fixed bug causing charset encoding not to be passed to the parser +- soap_fault: added default encoding to the fault serialization +- soap_parser: changed the parser to pre-load the parent's result array when processing scalar values. This increases parsing speed. + +2003-07-23, version 0.6.5 +- soap_base: fix code that overwrites user-supplied attributes in serialize_val +- soap_base: use arrays-of-arrays rather than attempting multi-dimensional in serialize_val +- xmlschema: emit import statements and qualify all elements with prefix in serializeSchema (better interop with validation tools) +- soapclient: get xml character encoding from HTTP Content-Type header if provided, e.g. text/xml;charset="UTF-8" +- soapclient: use headers in call if provided (previously ignored this parameter) +- soap_server: in parse_request, if neither getallheaders nor $_SERVER are available, use $HTTP_SERVER_VARS to get SOAPAction and xml encoding + +2003-07-24, version 0.6.5 +- soap_transport_http: apply patch from Steven Brown "if the server closes connection prematurely, nusoap would spin trying to read data that isn't there" + +2003-07-25, version 0.6.5 +- wsdl: apply patch from Sven to workaround single schema limitation +- wsdl: apply a variant of the patch from Holger to handle empty values for array by serializing an array with 0 elements +- xmlschema: remove the redundant default namespace attribute on the schema element; everything in xsd is explicitly specified as being from xsd +- soap_transport_http: fix setCredentials and add TODO comments in sendHTTPS about what to change if this setCredentials stays + +2003-07-30, version 0.6.5 +- nusoap_base: change documentation of soap_defencoding to specify it is the encoding for outgoing messages +- nusoap_base: only change &, <, > to entities, not all HTML entities +- soap_transport_http: update the Content-Type header in sendRequest, since soap_defencoding could be changed after ctor is called +- soap_server: use soap_defencoding instead of charset_encoding +- soap_server: read encoding from _SERVER if available +- nusoap_base: do entity translation for string parameters with an xsd type specified (thanks David Derr) + +2003-07-31, version 0.6.5 +- soap_transport_http: add proxy authentication +- soap_transport_http: build payload the same way for http and https +- wsdl: add proxy authentication +- soapclient: add proxy authentication +- soapclient: allow proxy information in ctor, so that it can be used for wsdl + +2003-08-01, version 0.6.5 +- soap_transport_http: close a persistent connection that's at EOF +- soap_transport_http: prevent conflicts between setEncoding and usePersistentConnection +- soap_transport_http: fix use of $headers instead of $this->incoming_headers in getResponse +- soapclient: improve handling of persistent connections +- soapclient: force xml_encoding to upper case +- soap_server: let the Web server decide whether to close the connection (no Connection: close header) +- soap_server: force xml_encoding to upper case + +2003-08-04, version 0.6.5 +- soap_parser: use XML type information to pick a PHP data type; also decode base64 +- soap_server: read all HTTP headers when using _SERVER or HTTP_SERVER_VARS +- soap_server: add gzip encoding support for outgoing messages +- soap_transport_http: deflate is gzcompress/gzuncompress (cf. http://archive.develooper.com/libwww@perl.org/msg04650.html) +- soap_transport_http: clean use of persistentConnection so it's always a set boolean +- soapclient: add responseData member to access deflated/gunzipped payload + +2003-08-05, version 0.6.5 +- soap_server: look multiple places when setting debug_flag + +2003-08-07, version 0.6.5 +- nusoap_base: serialize specified type (e.g. ArrayOfString) even for simple array +- wsdl: only specify encodingStyle in the input/output soap bindings when it is not empty (thanks Guillaume) + +2003-08-15, version 0.6.5 +- soap_parser: fix parsing of elements with no XSD type specified +- soap_parser: use PHP string type for XSD long and unsignedLong types + +2003-08-16, version 0.6.5 +- soap_parser: fix code generating warning (thanks Torsten) + +2003-08-19, version 0.6.5 +- soap_parser: fix another line of code generating a warning (thanks Torsten) + +2003-08-22, version 0.6.5 +- soap_server: remove all '--' from debug_str; previous code changed '---' to '- --' +- wsdl, soapclient, soap_parser: patch submitted by Mark Spavin as described by + the following... +> Changes for the multiple/nested imports from the wsdl file. This builds an +> array of files not just the last one and also checks for relative paths to +> the parent. This will then get the imported files from the remote site +> instead of your local disk. Local wsdl files should still work (untested). +> +> Changes for multiple encoding sytles as previously posted + +2003-08-24, version 0.6.5 +- wsdl, soapclient: fix some PHP notices from previous update + +2003-08-26, version 0.6.5 +- wsdl: support multiple SOAP ports +- soapclient, soap_server: when no charset is specified, use UTF-8, even though HTTP specifies US-ASCII. +- soap_transport_http: do not prepend $host with 'ssl://' for https (is this required for older cURL versions?) + +2003-08-27, version 0.6.5 +- soap_server: support compressed request messages (thanks John Huong) +- soap_parser: deserialize Apache Vector as an array +- xmlschema: use $this->typemap in getPHPType (which is not used) +- soapclient, wsdl: check for WSDL errors after serializing parameters +- nusoap_base: add serialization of Apache Map (when not using WSDL) +- wsdl: add serialization of Apache Map (when using WSDL) +- wsdl: only change &, <, > to entities, not all HTML entities + +2003-08-28, version 0.6.5 +- soap_transport_http: disable cURL verification of peer and server (formerly the cURL default) +- soap_transport_http: mingle cURL code with straight http, so sendHTTP is no longer needed + +2003-08-29, version 0.6.6 +- soap_transport_http: add setContentType +- soapclient: call setContentType using new getHTTPContentType and getHTTPContentTypeCharset + +2003-09-05, version 0.6.6 +- wsdl: add some more code to handle null/nil values (but there's still a way to go) + +2003-10-21, version 0.6.6 +- soap_transport_http: only include port in Host header if it was specified in the URL +- soap_transport_http: add some code to use OpenSSL for PHP ssl:// scheme, but comment out since it's not ready +- soap_server: use $_SERVER['PHP_SELF'] if $GLOBALS['PHP_SELF'] is not set +- wsdl: add WSDL request and response and transport debug to debug +- wsdl: handle custom type extending xmlschema namespace (GLUE ... Thanks Matt) +- soap_parser: add param to docs +- soapclient: add getHTTPBody, getHTTPContentType, getHTTPContentTypeCharset (anticipating MIME subclass) + +2003-10-28, version 0.6.6 +- nusoap_base: add expandEntities method +- wsdl: use expandEntities +- soap_fault: use expandEntities +- soap_transport_http: Allow credentials to be included in URL, rather than requiring setCredentials +- soap_transport_http: Merge HTTP headers that span multiple lines +- soap_parser: Properly set errors in ctor +- soapclient: Pass headers to parseResponse and parse them in that method + +2003-10-30, version 0.6.6 +- xmlschema: Add some information for the related type to an element + +2003-12-09, version 0.6.6 +- nusoap_base: Add some namespace methods previously in xmlschema +- xmlschema: Improve parsing of complexType, element and simpleType +- xmlschema: Improve serialization +- xmlschema: Track imports +- xmlschema: Track elementFormDefault and form attributes +- wsdl: Support multiple (note that setting $server->wsdl->schemaTargetNamespace no longer does anything! Use configureWSDL instead.) +- wsdl: Use form attribute of element to control namespace specification +- wsdl: Support chained imports (A imports B which imports C) +- wsdl: Include port in endpoint address when serializing +- soap_server: Fix use of style (rpc|document) and use (encoded|literal) +- soap_server: Support _SERVER[CONTENT_TYPE] in addition to _SERVER[HTTP_CONTENT_TYPE] +- soap_server: Support wsdl with multiple +- soap_client: Remove a var_dump +- soap_client: Add style and use parameters to call method to support doc/lit without WSDL +- soap_transport_http: Check that $this->fp exists when doing persistent connections + +2003-12-17, version 0.6.6 +- soap_server: pass namespaces to xmlschema constructor +- wsdl: post-process after all imports +- wsdl: remove some debug, add some error handling +- xmlschema: allow enclosing namespaces to be specified in constructor +- xmlschema: improve handling of compositors and simple types + +2004-01-08, version 0.6.6 +- soap_server: when requested WSDL is in a file, return to client using passthru (thanks Ingo Fischer) +- soapclient: have proxy inherit more client state +- soapclient: allow timeout and response timeout to be specified in the constructor +- wsdl: allow timeout and response timeout to be specified in the constructor +- soap_transport_http: allow response timeout to be specified in send and sendHTTPS + +2004-01-28, version 0.6.6 +- wsdl: add namespace for array and scalar when form is qualified +- wsdl: fix a bug in which data type of complexType elements were ignored in serialization +- wsdl: enhance handling of URLs with file scheme +- wsdl: add addSimpleType +- xmlschema: add addSimpleType +- xmlschema: always set phpType elements +- soapclient: allow a wsdl instance to be specified in constructor +- soap_server: allow a wsdl instance to be specified in constructor (not tested!) +- soap_server: fix default SOAPAction created in register method +- soap_transport_http: accept chunking with LF separators in addition to CRLF. +- wsdlcache: added class +- nusoapmime: fix comments + +2004-02-23, version 0.6.6 +- soap_transport_http: don't try to unchunk cURL data, since cURL already does it +- soap_transport_http: append CVS revision to version in User-Agent +- wsdl: serialize boolean as true|false, not 1|0, to agree with XML Schema +- soap_server: always exit() after returning WSDL +- soap_server: use the WSDL URL scheme as the default endpoint URL scheme +- soap_server: append CVS revision to version in X-SOAP-Server +- nusoap_base: add (CVS) revision +- wsdlcache: synchronize using a per-WSDL lock file (Thanks Ingo) +- wsdlcache: add cache lifetime, after which cache contents are invalidated (Thanks Ingo) + +2004-03-15, version 0.6.6 +- nusoap_base: add isArraySimpleOrStruct method +- soap_server: improve WSDL URL scheme determination +- soap_server: only deflate/gzip payloads > 1024 bytes +- soap_server: fix parameter order in fault method (always used as faultcode, faultstring) +- soap_server: refactor parse_request into multiple functions (for sanity) +- soap_server: set the namespace on the Response element to the same as the request +- soap_server: name the return value element 'return' by default +- soap_server: added and documented data fields, so that service programmers can use them if desired +- soap_parser: standardize parsing error message +- soap_parser: fix document and responseHeaders so they are the correct XML text (as documented) +- soap_transport_http: fix read from persistent connection +- soapclient: clean up debugging for persistent connection +- wsdl: enforce correct naming of messages parts when an associative array is used for parameters +- wsdl: better serialization of null values +- wsdl: standardize parsing error message +- xmlschema: standardize parsing error message + +2004-03-24, version 0.6.7 +- soap_transport_http: add digest authentication (based on code by Kevin A. Miller) +- xmlschema: improve parsing of import elements +- wsdl: do schema imports even if there are no wsdl imports + +2004-04-12, version 0.6.7 +- wsdl: serialize multiple elements when maxOccurs="unbounded" and value is an array +- wsdl: serialize soapval values (used to force an XML type, e.g. when WSDL uses an abstract type) +- nusoapmime: do not require nusoap.php (it is now the programmer's responsibility) + +2004-04-21, version 0.6.7 +- soap_parser: parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element) +- soap_server: do not wrap response in a response element for a document style service + +2004-04-30, version 0.6.7 +- soap_transport_http: allow digest auth params to be separated by "," as well as ", " +- soap_transport_http: re-initialize incoming headers for each response +- soap_server: add methodreturnisliteralxml property to allow service function to return XML as a string +- soapclient: improve rpc/literal support +- soapclient: allow XML string as call params in addition to array +- soapclient: support document style and literal encoding when not using WSDL + +2004-05-05, version 0.6.7 +- wsdl: serialize PHP objects for WSDL XML Schema complexTypes, in addition to associative arrays +- wsdl: fix WSDL generation when there is no encodingStyle +- soap_transport_http: suppress fsockopen warnings +- soap_transport_http: detect socket timeouts when reading (0 bytes returned) +- soap_transport_http: read chunked content "in-line" so it works on a persistent connection +- nusoap_base: serialize boolean as true|false, not 1|0, to agree with XML Schema +- nusoap_base: serialize array of struct differently than array of array + +2004-06-25, version 0.6.8 +- soap_server: prefer gzip to deflate, since IE does not like our deflate +- soap_server: move webDescription to the wsdl class +- soap_server: allow class and instance method calls for service (thanks Ingo Fischer and Roland Knall) +- wsdl: get webDescription from the soap_server class +- wsdl: allow compression from the server +- wsdl: fix serialization of soapval without a type +- wsdl: propagate debug value from query string to SOAP endpoint in programmatic WSDL generation +- nusoap_base: add anyType, anySimpleType for 2001 XML Schema +- nusoap_base: provide additional debug functions +- soap_transport_http: ignore Content-Length when chunked encoding is used +- soap_transport_http: remove ':' from username for Basic authentication (cf. RFC 2617) +- soap_transport_http: urldecode username and password taken from URL +- soap_transport_http: use raw inflate/deflate for IE/IIS compatibility, rather than having Zlib headers according to HTTP 1.1 spec +- soap_transport_http: attempt to handle the case when both the service application and Web server compress the response +- soapclient: when creating proxy methods, replace '.' in operation name with '__' in function name +- soapclient: initialize requestHeaders in proxy +- general: use new debug methods; never access debug_str directly + +2004-09-30, version 0.6.8 +- soapclient: do not allow getProxy call when WSDL is not used +- soapclient: use ISO-8859-1 as the charset if not specified in the Content-Type header +- soapclient: when an empty string is specified for the call namespace, do not put the method element in a namespace +- soapclient: let soap_transport_http check for SSL support +- soapclient: have proxy inherit soap_defencoding from the client from which it is generated +- soapclient: do not assume that 'ns1' is an unused namespace prefix; always generate namespace prefixes randomly +- soap_parser: compare any encoding in the XML declaration to the charset from the HTTP Content-Type header (thanks Ingo Fischer) +- soap_parser: improve parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element) +- soap_server: use ISO-8859-1 as the charset if not specified in the Content-Type header +- soap_server: allow suppression of automatic UTF-8 decoding +- soap_server: fix a bug when call_user_func_array() is used +- soap_transport_http: correct digest authentication through a proxy +- wsdl: serialize SOAP-ENC types similarly to XSD types +- xmlschema: force unprefixed type into default namespace +- xmlschema: fix serialization of definition of simple types + +2004-10-01, version 0.6.8 +- soap_parser: handle default namespace attributes +- soap_server: add default_utf8 field +- soap_server: support literal encoding (with RPC style) +- soap_transport_http: parse HTTP status and generate error for 300, 302-307, 400, 401-417, 501-505 (thanks for the idea Ghislain) +- soap_transport_http: follow HTTP redirection (HTTP status 301 and Location header) (thanks for the idea Ghislain) +- xmlschema: allow any attributes to be specified in an element of a complexType, e.g., abstract, default, form, minOccurs, maxOccurs, nillable (thanks Jirka Pech for the original patch) + +2004-10-02, version 0.6.8 +- soapclient: read/write cookies (thanks Ingo) +- soap_server: change faultcode on non-resendable faults to Client +- soap_transport_http: read/write cookies (thanks Ingo) + +2004-10-05, version 0.6.8 +- wsdl: add addElement method +- wsdl: support the document style in the register method +- xmlschema: parse unnamed simpleTypes, rather than ignoring them +- xmlschema: include untyped elements when parsing a complexType +- xmlschema: add addElement method + +2004-10-14, version 0.6.8 +- soapclient: support client certificates +- soap_parser: deserialize attributes, prefixing names with "!" +- soap_server: notify the client with HTML when WSDL is requested but not supported by service +- soap_transport_http: support client certificates +- wsdl: support defaults for elements of a complexType +- wsdl: serialize elements from complexType extension base +- wsdl: serialize data (associative array elements) as attributes according to XML Schema +- xmlschema: record extension base if present for a complexType + +2004-12-15, version 0.6.8 +- nusoap_base: add 2000 XML Schema (rare, but used by Akamai) +- soap_parser: avoid deserializing more common attributes that are not data +- soap_parser: be lax when HTTP specifies ISO-8859-1 (the default) and XML specifies UTF-8 (the norm) +- soap_server: account for the fact that get_class_methods returns methods in all lower case (thanks Steve Haldane) +- soap_transport_http: parse digest info that includes '=' in the data (thanks Jinsuk Kim) +- wsdl: feably handle some cases for literal serialization of form="unqualified" elements +- wsdl: don't serialize the decimal portion of a PHP double when the XML type is long +- wsdl: fix serialization of attributes for complexType that is an extension +- wsdlcache: enhance diagnostics +- xmlschema: handle untyped elements +- xmlschema: handle WSDL for SOAP Array that uses the base attribute plus a sequence of element + +2005-01-22, version 0.6.8 +- wsdl: allow an element in one schema to have a type from another schema + +2005-01-24, version 0.6.8 +- xmlschema: correctly parse nested complexType definitions + +2005-02-14, version 0.6.8 +- nusoap_base: fix a bug in which attributes were sometimes not serialized with a value +- nusoap_base: improve serialization of null values (thanks Dominique Stender) +- soap_parser: parse null values by handling the nil attribute (thanks Dominique Stender) +- soap_server: set character encoding for a fault to be the same as for the server (thanks Mark Scott) +- soap_server: correctly check for null value returned from method when WSDL is used (without WSDL, cannot distinguish whether NULL or void return is desired) +- soapclient: for document style, call should always return an array rooted at the response part (all bets are off when there are multiple parts) +- xmlschema: save enumeration values parsed from WSDL + +2005-02-10, version 0.6.9 +- soapclient: only set SOAP headers when they are specified in call params (so setHeaders still works) + +2005-04-04, version 0.6.9 +- soap_server: use get_class instead of is_a (thanks Thomas Noel) +- soapclient: use get_class instead of is_a (thanks Thomas Noel) +- soapclient: add setEndpoint method +- soap_transport_http: fix client certificates (thanks Doug Anarino and Eryan Eriobowo) + +2005-04-29, version 0.6.9 +- nusoap_base: add global variable and methods for setting debug level +- nusoap_base: use xsd:anyType instead of xsd:ur-type to serialize arrays with multiple element types (thanks Ingo Fischer) +- nusoap_base: expand entities in attributes (thanks Gaetano Giunta) +- soapclient: call parent constructor +- soapval: call parent constructor +- soap_fault: call parent constructor +- soap_parser: call parent constructor +- soap_server: assume get_class_methods always returns lower case for PHP 4.x only +- soap_server: call parent constructor +- soap_transport_http: do nothing in setEncoding if gzdeflate is not present (thanks Franck Touanen for pointing this out) +- soap_transport_http: fix check for server request for digest authentication (thanks Mark Spavin) +- soap_transport_http: call parent constructor +- wsdl: fix documentation page popup of one method after another (thanks Owen) +- wsdl: call parent constructor +- wsdl: expand entities in attributes (thanks Gaetano Giunta) +- xmlschema: call parent constructor + +2005-06-03, version 0.6.9 +- nusoap_base: serialize empty arrays as having elements xsd:anyType[0] +- nusoap_base: add encodingStyle parameter to serializeEnvelope +- nusoap_base: serialize xsi:type with nil values +- nusoap_base: improve debug and comments +- soap_parser: correctly parse an empty array to an empty array, not an empty string +- soap_parser: improve debug and comments +- soap_server: specify encodingStyle for envelope when WSDL is used +- soapclient: factor out new getProxyClassCode method +- soapclient: specify encodingStyle for envelope +- soapclient: improve debug and comments +- wsdl: add namespace for Apache SOAP types if a variable of such type is serialized +- wsdl: serialize nil value for nillable elements when no value is provided +- wsdl: serialize xsi:type with nil values +- wsdl: copy attributes as well as elements to an element from its complexType +- wsdl: specify encodingStyle for operations +- wsdl: improve debug and comments +- xmlschema: improve debug and comments + +2005-06-03, version 0.7.0 +- nusoap_base: improve debug and comments +- nusoap_base: fix version, which should have been 0.7.0 since 2005-03-04 + +2005-06-06, version 0.7.1 +- nusoap_base: adjust numeric element names for serialization, instead of forcing them to 'soapVal' +- nusoapmime: add type=text/xml to multipart/related (thanks Emmanuel Cordonnier) +- soap_fault: fix serialization of detail +- soap_server: check required parameters for register method +- soap_server: when getallheaders is used, massage header names +- soap_server: use SOAPAction to determine operation when doc/lit service does not wrap parameters in an element with the method name (thanks Peter Hrastnik) +- soap_transport_http: correctly handle multiple HTTP/1.1 100 responses for https (thanks Jan Slabon) +- wsdl: fixed documentation for addComplexType (thanks Csintalan dm) +- wsdl: serialize array data when maxOccurs = 'unbounded' OR maxOccurs > 1 (thanks Dominique Schreckling) +- wsdl: when serializing a string == 'false' as a boolean, set the value to false +- wsdl: when serializing a complexType, require the PHP value supplied to be an array + +2005-07-01, version 0.7.1 +- nusoap_base: Allow SOAP headers to be supplied as an array like parameters +- soap_parser: de-serialize simpleContent that accompanies complexContent +- soap_server: append debug information when programmatically-defined WSDL is returned +- soap_transport_http: Add debug when an outgoing header is set +- soapclient: Allow SOAP headers to be supplied as an array like parameters +- xmlschema: serialize attributes more generally, rather than assuming they are for SOAP 1.1 Array +- wsdl: when serializing, look up types by namespace, not prefix (simple programmatic doc/lit WSDL now seems to work) +- wsdl: process namespace declarations first when parsing an element + +2005-07-27, version 0.7.1 +- nusoap_base: do not override supplied element name with class name when serializing an object in serialize_val +- nusoap_base: remove http://soapinterop.org/xsd (si) from namespaces array +- nusoapmime: add nusoapservermime class to implement MIME attachments on the server +- soap_fault: improve documentation +- soap_server: improve documentation +- soap_server: make consistent use of _SERVER and HTTP_SERVER_VARS +- soap_server: make all incoming HTTP header keys lower case +- soap_server: add hook functions to support subclassing for MIME attachments +- soap_transport_http: remove an unnecessary global statement +- soapclient: when creating a proxy, make $params within each function an associative array +- soapval: improve documentation +- wsdl: when serializing complexType elements, used typed serialization if there is either a type or a reference for the element +- wsdl: allow PHP objects to be serialized as SOAP structs in serializeType +- wsdl: for WSDL and XML Schema imports, don't forget to use the TCP port number (thanks Luca GIOPPO) +- wsdl: make consistent use of _SERVER and HTTP_SERVER_VARS +- xmlschema: improve documentation + +2005-07-31, version 0.7.2 +- nusoap_base: correctly serialize attributes in serialize_val (thanks Hidran Arias) +- soap_parser: when resolving references, do not assume that buildVal returns an array (thanks Akshell) +- soap_parser: removed decode_entities, which does not work (thanks Martin Sarsale) +- soap_server: fix a bug parsing headers from _SERVER and HTTP_SERVER_VARS (thanks Bert Catsburg) +- soap_server: parse all "headers" from HTTP_SERVER_VARS (not just HTTP_*) +- soap_server: use PHP_SELF instead of SCRIPT_NAME for WSDL endpoint +- soap_server: when generating a fault while debug_flag is true, put debug into faultdetail +- wsdl: add enumeration parameter to addSimpleType +- xmlschema: add enumeration parameter to addSimpleType + +2006-02-02, version 0.7.3 +- soapclient: initialize paramArrayStr to improve proxy generation +- soap_parser: handle PHP5 soapclient's incorrect transmission of WSDL-described SOAP encoded arrays. +- soap_server: don't assume _SERVER['HTTPS'] is set; try HTTP_SERVER_VARS['HTTPS'] if it is not +- soap_server: "flatten out" the parameter array to call_user_func_array (thanks Andr Mamitzsch) +- soap_server: make thrown exceptions conform to specs +- wsdl: use serialize_val to serialize an array when the XSD type is soapenc:Array (JBoss/Axis does this) +- wsdl: change formatting of serialized XML for the WSDL +- xmlschema: change formatting of namespaces when serializing XML for the schema + +2006-04-07, version 0.7.3 +- soap_server: if methodparams is not an array, call call_user_func_array with an empty array (thanks Eric Grossi) +- wsdl: distinguish parts with element specified from those with type specified by suffixing element names with ^ +- wsdl: do a case-insensitive match on schema URI when looking for type +- xmlschema: only get element (not type) when name has ^ suffix + +2006-05-16, version 0.7.3 +- soapclient: add getHeader to get parsed SOAP Header +- soap_parser: check status when receiving Header or Body element +- soap_parser: add soapheader +- soap_server: add requestHeader with parsed SOAP Header + +2006-06-15, version 0.7.3 +- wsdl: fix bug in addComplexType (thanks Maarten Meijer) +- soap_transport_http: change cURL message + +2007-03-19, version 0.7.3 +- soapclient: declare as nusoapclient, then also subclass soapclient if SOAP extension not loaded +- soapclientmime: declare as nusoapclientmime, then also subclass soapclientmime if SOAP extension not loaded + +2007-03-28, version 0.7.3 +- nusoap_base: fix serialization of a soapval when its value is a soapval +- soapval: fix serialization of a soapval when its value is a soapval +- soapval: add __toString (cf. http://article.gmane.org/gmane.comp.php.nusoap.general/2776) +- nusoapclient: use lazy retrieval of WSDL instead of always getting it in the constructor +- nusoapclient: fix getProxy that was broken in last revision +- wsdl: add ability to set authorization credentials and retrieve WSDL outside of constructor + +2007-04-05, version 0.7.3 +- nusoapclientmime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman) +- nusoapclientmime: obey RFC 2045 Section 5.1 (thanks Chris Butler) +- nusoapservermime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman) +- nusoapservermime: obey RFC 2045 Section 5.1 (thanks Chris Butler) +- nusoap_base: remove extra whitespace from some XML elements +- nusoap_base: allow SOAP headers to be specified as an associative array (thanks Unique) +- nusoap_base: implement __toString +- nusoap_base: improve doc accuracy and consistency (thanks Martin K?gler) +- iso8601_to_timestamp: avoid problem with negative hours after calculation, etc. (thanks Guntram Trebs) +- nusoapclient: support user-settable cURL options (thanks Ciprian Popovici) +- nusoapclient: call SOAP 1.2 binding operations if no SOAP 1.1 present (there is no reason to believe this will always work!) +- nusoapclient: improve doc accuracy and consistency (thanks Martin K?gler) +- soap_server: don't try to use eval to call function when any parameter is an object +- soap_server: don't print return value within debug string; returned objects would need __toString in PHP 5.2 +- soap_server: use URL scheme for WSDL access as the scheme in SOAPAction +- soap_server: strip port number from server name (some FastCGI implementations include port in server name) +- soap_transport_http: support user-settable cURL options (thanks Ciprian Popovici) +- soap_transport_http: use cURL for NTLM authentication +- soap_transport_http: make digest authentication work for GET as well as POST +- soap_transport_http: improve doc accuracy and consistency (thanks Martin K?gler) +- soapval: remove __toString +- wsdl: set operation style if necessary, but do not override one already provided (thanks Raffaele Capobianco) +- wsdl: check SOAP 1.2 binding operations if no SOAP 1.1 present +- wsdl: improve doc accuracy and consistency (thanks Martin K?gler) +- xmlschema: fix simpleType serialization +- xmlschema: improve doc accuracy and consistency (thanks Martin K?gler) + +2007-04-09, version 0.7.3 +- nusoapclient: set decode_utf8 when creating a proxy (thanks Dmitri Dmitrienko) +- nusoapclient: rename class to nusoap_client +- soap_fault: also provide a class named nusoap_fault +- soap_parser: also provide a class named nusoap_parser +- soap_server: also provide a class named nusoap_server +- soap_transport_http: skip HTTP responses 301 and 401 when using cURL +- soap_transport_http: don't force HTTP Connection header when using cURL +- soap_transport_http: don't set HTTP Host and Content-Length headers when using cURL +- soap_transport_http: support CURLOPT_SSLCERTPASSWD (thanks David Blanco) +- wsdl: support user-settable cURL options (thanks Ciprian Popovici) +- wsdl: serialize parameters for non-SOAP 1.1 binding operations (there is no reason to believe this will always work!) +- xmlschema: also provide a class named nusoap_xmlschema +- nusoapclientmime: rename class to nusoap_client_mime +- nusoapservermime: rename class to nusoap_server_mime + +2007-04-11, version 0.7.3 +- nusoap_client: enable cURL usage to be forced (thanks Giunta Gaetano) +- soap_transport_http: enable cURL proxy usage (thanks Giunta Gaetano) +- soap_transport_http: enable cURL usage to be forced (thanks Giunta Gaetano) +- soap_transport_http: use cURL's HTTP authentication options for basic, digest +- wsdl: enable cURL usage to be forced (thanks Giunta Gaetano) + +2007-04-12, version 0.7.3 +- nusoap_client: add debug +- nusoap_xmlschema: don't add elements of complexTypes to elements array (thanks Heiko Hund) +- soap_transport_http: set cURL connection timeout if supported +- soap_transport_http: add debug when setting cURL option +- soap_transport_http: fix digest authentication broken in previous revision +- wsdl: add debug +- wsdlcache: address some issues with non-existing cache-files and PHP Warnings which came in such cases (thanks Ingo Fischer) +- wsdlcache: change class name to nusoap_wsdlcache + +2007-04-13, version 0.7.3 +- wsdl: wrap parameters if unwrapped values are supplied and WSDL specifies Microsoft-style wrapping + +2007-04-16, version 0.7.3 +- nusoap_base: avoid warning in getDebugAsXMLComment +- nusoap_client: small debug change +- nusoap_client_mime: set responseData when the root part is found + +2007-04-17, version 0.7.3 +- soap_transport_http: improve detection of undefined cURL options (thanks Ingo Fischer) + +2007-05-28, version 0.7.3 +- soap_transport_http: support digest authentication opaque feature (cf. RFC 2617) (thanks Daniel Lacroix) +- soap_transport_http: check safe_mode and open_basedir before setting CURLOPT_FOLLOWLOCATION +- soap_transport_http: skip "HTTP/1.0 200 Connection established" header when cURL returns it (thanks Raimund Jacob) +- nusoap_client: improve handling when getProxy is called and WSDL is not being used +- nusoap_base: add comments about which specifications are used/implemented by NuSOAP +- nusoap_xmlschema: create names for unnamed types that are unique by scope within XML Schema + +2007-06-11, version 0.7.3 +- wsdl: wrap return value if unwrapped value is supplied and WSDL specifies Microsoft-style wrapping + +2007-06-22, version 0.7.3 +- nusoap_xmlschema: fix serialization of simpleType restriction (thanks Rizwan Tejpar) + +2007-07-30, version 0.7.3 +- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) +- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) + +2007-10-21, version 0.7.3 +- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) +- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras) + +2007-10-26, version 0.7.3 +- nusoap_server: Fix munging of _SERVER variables that start with HTTP_ (thanks Thomas Wieczorek) + +2007-10-30, version 0.7.3 +- nusoap_xmlschema: Serialize values for elementFormDefault, attributeFormDefault +- wsdl: Improve consistency between doc/lit schema auto-wrapping and client's parsed schema +- nusoap_server: Correct bug that placed encodingType in Envelope for doc/lit +- nusoap_server: Specify elementFormDefault for schema within doc/lit wsdl + +2007-10-31, version 0.7.3 +- wsdl: Fix typo in parametersMatchWrapped (thanks Sam Stepanyan) +- soap_transport_http: Fix three typos in setProxy (thanks Sam Stepanyan) +- nusoap_xmlschema: Fix typo in serializeTypeDef (thanks Sam Stepanyan) + +2007-11-06, version 0.9.5 +- wsdl: Improve handling of return values from doc/lit methods +- nusoap_server: Handle case when method is not in a namespace + +2007-11-27, version 0.9.5 +- nusoap_server: always try to invoke service for a POST +- nusoap_server: only return Location: for WSDL at http://... +- nusoap_base: change some syntax associated with globalDebugLevel + +2008-01-08, version 0.9.5 +- nusoap_server: fix a typo where = was used instead of == (thanks J. (Johan) Bosma) + +2008-01-10, version 0.9.5 +- nusoap_client: handle case where request or response has no content-type header (thanks Ingo Fischer) +- nusoap_server: handle case where request or response has no content-type header (thanks Ingo Fischer) +- wsdl: change CSS for .title in webDescription (thanks Marcus Uy) + +2008-01-25, version 0.9.5 +- nusoap_xmlschema: when an element is of a complexType that is an extension, copy extensionBase from the type +- nusoap_xmlschema: do not apply elementFormDefault to globally defined elements + +2008-02-11, version 0.9.5 +- wsdl: internally set form of wrapped parameter elements to unqualified (so server handles correctly) + +2008-03-03, version 0.9.5 +- nusoap_xmlschema: fix extension when base type has no explicit prefix +- nusoap_xmlschema: support XML Schema include +- wsdl: improve support for sequence by serializing inherited attributes and elements first + +2008-03-04, version 0.9.5 +- wsdl: allow WSDL port name to be specified in getOperations +- nusoap_client: allow WSDL port name to be specified in ctor + +2008-03-06, version 0.9.5 +- wsdl: fix some port name variable references +- nusoap_base: change comments regarding preferred mode of support +- wsdl2nusoap: initial revision + +2008-03-14, version 0.9.5 +- nusoap_base: fix timezone offset in timestamp_to_iso8601 (thanks Mario Trojan) + +2008-03-27, version 0.9.5 +- nusoap_server: fix bug setting encodingStyle in serialize_return (thanks Luca Gobbo) + +2008-05-15, version 0.9.5 +- nusoap_parser: handle case where Header or Body tags are used within SOAP messages (thanks Sergey Zhuravlev) + +2008-08-26, version 0.9.5 +- wsdl: serialize simpleContent for complexType +- wsdl: avoid serializing complexType elements with no value and minOccurs = 0 regardless of nillability + +2010-04-26, version 0.9.5 +- nusoap_xmlschema: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- wsdl: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- soap_transport_http: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- soap_transport_http: remove call to deprecated function set_magic_quotes_runtime +- nusoap_server: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- nusoap_server: check that value is an object before calling get_class (thanks Pier-Luc Duchaine) +- nusoap_parser: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- nusoap_client: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- nusoap_client: do not assign the return value of new by reference (it is deprecated) (thanks Pier-Luc Duchaine) +- nusoap_base: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine) +- nusoapmime: do not assign the return value of new by reference (it is deprecated) + +2010-04-27, version 0.9.6 +- soap_transport_http: fix proxy connection (the port was wrong) (thanks Marcel Berteler) +- soap_transport_http: support authentication type 'any' using cURL (thanks Vojko Drev) +- nusoap_client: support authentication type 'any' using cURL (thanks Vojko Drev) +- wsdl: support authentication type 'any' using cURL (thanks Vojko Drev) +- nusoap_server: add TODO regarding ReflectionClass +- nusoap_base: bump version, add TODO regarding gmtime + +2010-04-28, version 0.9.6 +- nusoap_base (timestamp_to_iso8601): use gmdate for UTC +- nusoap_xmlschema: ensure element ref attribute always includes namespace +- soap_transport_http: if HTTP status is 403 and Content-Type is text/xml, try processing as SOAP Fault (for Amazon) + +2010-05-26, version 0.9.6 +- nusoap_parser: inject encoding from HTTP into XML declaration if not already specified +- wsdl: add optional portName parameter to getOperationData, getOperationDataForSoapAction, serializeRPCParameters, serializeParameters +- nusoap_client: specify portName when calling serializeRPCParameters + +2010-06-18, version 0.9.6 +- wsdl: restore wrapped return value kludge +- wsdl: enhance Microsoft-style wrapped parameter serialization for output parameters + +2010-06-30, version 0.9.6 +- wsdl: fix debug string to use $elements instead of $elements (thanks karvinen) + +2010-??-??, version 0.9.6 +- nusoap_server: add operation dispatch mapping (experimental) + +2010-11-11, version 0.9.6 +- nusoap_xmlschema: fix a bug resolving the namespace in the ref attribute of an element + +2011-01-13, version 0.9.6 +- soap_transport_http: Add HTTP/1.1 200 Connection established to skippable headers (thanks walovaton) +- soap_transport_http: Add HTTP/1.1 307 to skippable headers (thanks pdbarker) +- nusoap_server: Handle the case of no output parts (thanks pashkatlt) +- nusoap_server: Don't specify redundant (and archaic) header "Status: 500 Internal Server Error" (thanks pashkatlt) + +2011-01-15, version 0.9.6 +- nusoap_xmlschema: Parse element within complexType definition +- wsdl: Serialize !any type as literal string data + +2011-02-04, version 0.9.6 +- wsdl: When creating a wrapper type in addOperation, use the sequence compositor rather than all (provides JSR 172 compatibility) + +2011-02-14, version 0.9.6 +- wsdl: Support minOccurs and nillable when serializing PHP NULL values in serializeType + +2011-02-15, version 0.9.6 +- wsdl: When creating a wrapper type in addOperation, set form="qualified" for all elements being wrapped + +2011-02-16, version 0.9.6 +- nusoap_server: Support service-level documentation in configureWSDL +- wsdl: Support service-level documentation + +2011-02-28, version 0.9.6 +- nusoap_base: Set initial global debug level to 0 rather than 9 diff --git a/lib/class.nusoap_base.php b/lib/class.nusoap_base.php index 318c6ef..c9b1ff1 100644 --- a/lib/class.nusoap_base.php +++ b/lib/class.nusoap_base.php @@ -1,7 +1,7 @@ * @author Scott Nichol -* @version $Id: class.nusoap_base.php,v 1.56 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.nusoap_base.php,v 1.58 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_base { @@ -96,14 +96,14 @@ class nusoap_base { * @var string * @access private */ - var $version = '0.9.6'; + var $version = '0.9.6dev'; /** * CVS revision for HTTP headers. * * @var string * @access private */ - var $revision = '$Revision: 1.57 $'; + var $revision = '$Revision: 1.58 $'; /** * Current error string (manipulated by getError/setError) * @@ -148,8 +148,8 @@ class nusoap_base { * @var string * @access public */ - var $soap_defencoding = 'ISO-8859-1'; - //var $soap_defencoding = 'UTF-8'; + //var $soap_defencoding = 'ISO-8859-1'; + var $soap_defencoding = 'UTF-8'; /** * namespaces in an array of prefix => uri @@ -450,7 +450,7 @@ function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=fals if (is_null($val)) { $this->debug("serialize_val: serialize null"); if ($use == 'literal') { - // TODO: depends on minOccurs + // TODO: depends on minOccurs, nillable $xml = "<$name$xmlns$atts/>"; $this->debug("serialize_val returning $xml"); return $xml; @@ -902,6 +902,10 @@ function __toString() { * @access public */ function timestamp_to_iso8601($timestamp,$utc=true){ + if ($utc) { + return gmdate("Y-m-d\TH:i:s\Z", $timestamp); + } + $datestr = date('Y-m-d\TH:i:sO',$timestamp); $pos = strrpos($datestr, "+"); if ($pos === FALSE) { @@ -912,25 +916,7 @@ function timestamp_to_iso8601($timestamp,$utc=true){ $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2); } } - if($utc){ - $pattern = '/'. - '([0-9]{4})-'. // centuries & years CCYY- - '([0-9]{2})-'. // months MM- - '([0-9]{2})'. // days DD - 'T'. // separator T - '([0-9]{2}):'. // hours hh: - '([0-9]{2}):'. // minutes mm: - '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss... - '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's - '/'; - - if(preg_match($pattern,$datestr,$regs)){ - return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]); - } - return false; - } else { - return $datestr; - } + return $datestr; } /** @@ -993,4 +979,4 @@ function usleepWindows($usec) } -?> \ No newline at end of file +?> diff --git a/lib/class.soap_parser.php b/lib/class.soap_parser.php index f6932aa..8ca5e14 100644 --- a/lib/class.soap_parser.php +++ b/lib/class.soap_parser.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.soap_parser.php,v 1.42 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.soap_parser.php,v 1.43 2010/05/26 13:30:41 snichol Exp $ * @access public */ class nusoap_parser extends nusoap_base { @@ -85,9 +85,12 @@ function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ } } else { $this->debug('No encoding specified in XML declaration'); + $pos_end = strpos($xml, '?>', $pos_xml + 2); + $xml = substr($xml, 0, $pos_end) . " encoding=\"$encoding\"" . substr($xml, $pos_end); } } else { $this->debug('No XML declaration'); + $xml = "" . $xml; } $this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding); // Create an XML parser - why not xml_parser_create_ns? diff --git a/lib/class.soap_server.php b/lib/class.soap_server.php index 4f1321d..12dcf77 100644 --- a/lib/class.soap_server.php +++ b/lib/class.soap_server.php @@ -10,7 +10,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.soap_server.php,v 1.63 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.soap_server.php,v 1.67 2011/02/16 20:35:31 snichol Exp $ * @access public */ class nusoap_server extends nusoap_base { @@ -136,6 +136,18 @@ class nusoap_server extends nusoap_base { */ var $result = 'successful'; + /** + * dispatch map by operation element + * @var array + * @access private + */ + var $dispatchMapByOperationElement = array(); + /** + * dispatch map by SOAP Action + * @var array + * @access private + */ + var $dispatchMapBySOAPAction = array(); /** * assoc array of operations => opData; operations are added by the register() * method or by parsing an external WSDL definition @@ -522,36 +534,62 @@ function invoke_method() { $this->debug('in invoke_method, no WSDL to validate method'); } - // if a . is present in $this->methodname, we see if there is a class in scope, - // which could be referred to. We will also distinguish between two deliminators, - // to allow methods to be called a the class or an instance - if (strpos($this->methodname, '..') > 0) { - $delim = '..'; - } else if (strpos($this->methodname, '.') > 0) { - $delim = '.'; + // check for an explicit mapping + if (isset($this->dispatchMapByOperationElement[$orig_methodname])) { + $map = $this->dispatchMapByOperationElement[$orig_methodname]; + } elseif (isset($this->dispatchMapBySOAPAction[$this->SOAPAction])) { + $map = $this->dispatchMapBySOAPAction[$this->SOAPAction]; } else { - $delim = ''; + $map = array(); } - $this->debug("in invoke_method, delim=$delim"); - - $class = ''; - $method = ''; - if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) { - $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim)); - if (class_exists($try_class)) { - // get the class and method name - $class = $try_class; - $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim)); - $this->debug("in invoke_method, class=$class method=$method delim=$delim"); + + if (count($map) > 0) { + // there is a mapping + if ($map['invoke_class'] != '') { + $class = $map['invoke_class']; + $delim = '..'; + } elseif ($map['invoke_class_instance'] != '') { + $class = $map['invoke_class_instance']; + $delim = '.'; } else { - $this->debug("in invoke_method, class=$try_class not found"); + $class = ''; + $delim = ''; } + $try_class = $class; + $method = $map['invoke_function']; } else { - $try_class = ''; - $this->debug("in invoke_method, no class to try"); + // if a . is present in $this->methodname, we see if there is a class in scope, + // which could be referred to. We will also distinguish between two deliminators, + // to allow methods to be called a the class or an instance + if (strpos($this->methodname, '..') > 0) { + $delim = '..'; + } else if (strpos($this->methodname, '.') > 0) { + $delim = '.'; + } else { + $delim = ''; + } + $this->debug("in invoke_method, delim=$delim"); + + $class = ''; + $method = ''; + if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) { + $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim)); + if (class_exists($try_class)) { + // get the class and method name + $class = $try_class; + $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim)); + $this->debug("in invoke_method, class=$class method=$method delim=$delim"); + } else { + $this->debug("in invoke_method, class=$try_class not found"); + } + } else { + $try_class = ''; + $this->debug("in invoke_method, no class to try"); + } } // does method exist? + // TODO: use ReflectionClass for newer PHP versions in this part of the code if ($class == '') { if (!function_exists($this->methodname)) { $this->debug("in invoke_method, function '$this->methodname' not found!"); @@ -671,6 +709,9 @@ function serialize_return() { // $this->debug('wrap in element named ' . $name); //} $opParams = array($this->methodreturn); + } else { + $this->debug('no output parts, but wrap the method return in a simple array anyway'); + $opParams = array($this->methodreturn); } $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams); $this->appendDebug($this->wsdl->getDebug()); @@ -752,7 +793,7 @@ function send_response() { if ($this->fault) { $payload = $this->fault->serialize(); $this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error"; - $this->outgoing_headers[] = "Status: 500 Internal Server Error"; + //$this->outgoing_headers[] = "Status: 500 Internal Server Error"; } else { $payload = $this->responseSOAP; // Some combinations of PHP+Web server allow the Status @@ -943,6 +984,75 @@ function add_to_map($methodname,$in,$out){ $this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out); } + /** + * add an operation dispatch mapping + * + * (either $operation_element OR $soap_action should be specified) + * (one or neither of $invoke_class or $invoke_class_instance should be specified) + * ($invoke_function must always be specified) + * + * NOTE: this is separate from the register() method to support interface-first + * development of services; that technique normally uses an external WSDL file, + * so register() is never called. + * + * @param string $operation_element The XML element for the operation + * @param string $soap_action The SOAP Action for the operation + * @param string $invoke_function The function or method to invoke + * @param string $invoke_class The class on which to invoke as a class method + * @param string $invoke_class_instance The class on which to invoke as an instance method + * @return boolean true if added, false if not + * @access public + */ + function addDispatchMap($operation_element, $soap_action, $invoke_function, $invoke_class, $invoke_class_instance) { + // massage parameters + if (!is_string($operation_element)) + $operation_element = ''; + if (!is_string($soap_action)) + $soap_action = ''; + if (!is_string($invoke_class)) + $invoke_class = ''; + if (!is_string($invoke_class_instance)) + $invoke_class_instance = ''; + if (!is_string($invoke_function)) + $invoke_function = ''; + + // validate parameters + if ($operation_element == '' && $soap_action == '') { + $this->debug('addDispatchMap: Neither operation_element nor soap_action specified'); + return false; + } + if ($operation_element != '' && $soap_action != '') { + $this->debug('addDispatchMap: Both operation_element and soap_action specified'); + return false; + } + if ($invoke_class != '' && $invoke_class_instance != '') { + $this->debug('addDispatchMap: Both invoke_class and invoke_class_instance specified'); + return false; + } + if ($invoke_function == '') { + $this->debug('addDispatchMap: No value provided for invoke_function'); + return false; + } + + // create the map + $map['operation_element'] = $operation_element; + $map['soap_action'] = $soap_action; + $map['invoke_class'] = $invoke_class; + $map['invoke_class_instance'] = $invoke_class_instance; + $map['invoke_function'] = $invoke_function; + + // add to the appropriate map hash + if ($operation_element != '') { + $this->dispatchMapByOperationElement[$operation_element] = $map; + $this->debug("addDispatchMap: Added map for operation_element $operation_element"); + } else { + $this->dispatchMapBySOAPAction[$soap_action] = $map; + $this->debug("addDispatchMap: Added map for soap_action $soap_action"); + } + + return true; + } + /** * register a service function with the server * @@ -1044,8 +1154,9 @@ function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){ * @param string $style optional (rpc|document) WSDL style (also specified by operation) * @param string $transport optional SOAP transport * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false + * @param string $serviceDocumentation documentation for the service */ - function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false) + function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false, $serviceDocumentation = '') { global $HTTP_SERVER_VARS; @@ -1085,6 +1196,10 @@ function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style= $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME"; } + if (false == $transport) { + $transport = 'http://schemas.xmlsoap.org/soap/http'; + } + if(false == $schemaTargetNamespace) { $schemaTargetNamespace = $namespace; } @@ -1092,6 +1207,7 @@ function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style= $this->wsdl = new wsdl; $this->wsdl->serviceName = $serviceName; $this->wsdl->endpoint = $endpoint; + $this->wsdl->serviceDocumentation = $serviceDocumentation; $this->wsdl->namespaces['tns'] = $namespace; $this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/'; $this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/'; diff --git a/lib/class.soap_transport_http.php b/lib/class.soap_transport_http.php index 12043c7..64f03dc 100644 --- a/lib/class.soap_transport_http.php +++ b/lib/class.soap_transport_http.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.soap_transport_http.php,v 1.68 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.soap_transport_http.php,v 1.73 2011/01/14 18:34:16 snichol Exp $ * @access public */ class soap_transport_http extends nusoap_base { @@ -159,9 +159,9 @@ function setURL($url) { * @access private */ function io_method() { - if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) + if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && ($this->authtype == 'ntlm' || $this->authtype == 'any')) || ($this->scheme == 'http' && is_array($this->proxy) && ($this->proxy['authtype'] == 'ntlm' || $this->proxy['authtype'] == 'any'))) return 'curl'; - if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) + if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && $this->authtype != 'any' && (!is_array($this->proxy) || ($this->proxy['authtype'] != 'ntlm' && $this->proxy['authtype'] != 'any'))) return 'socket'; return 'unknown'; } @@ -215,9 +215,9 @@ function connect($connection_timeout=0,$response_timeout=30){ // open socket if($connection_timeout > 0){ - $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout); + $this->fp = @fsockopen( $host, $port, $this->errno, $this->error_str, $connection_timeout); } else { - $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str); + $this->fp = @fsockopen( $host, $port, $this->errno, $this->error_str); } // test pointer @@ -270,6 +270,10 @@ function connect($connection_timeout=0,$response_timeout=30){ $CURLAUTH_NTLM = CURLAUTH_NTLM; else $CURLAUTH_NTLM = 8; + if (defined('CURLAUTH_ANY')) + $CURLAUTH_NTLM = CURLAUTH_ANY; + else + $CURLAUTH_NTLM = -17; $this->debug('connect using cURL'); // init CURL @@ -372,6 +376,10 @@ function connect($connection_timeout=0,$response_timeout=30){ $this->debug('set cURL for NTLM authentication'); $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM); } + if ($this->authtype == 'any') { + $this->debug('set cURL for ANY authentication'); + $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_ANY); + } } if (is_array($this->proxy)) { $this->debug('set cURL proxy options'); @@ -386,9 +394,15 @@ function connect($connection_timeout=0,$response_timeout=30){ if ($this->proxy['authtype'] == 'basic') { $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC); } + if ($this->proxy['authtype'] == 'digest') { + $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_DIGEST); + } if ($this->proxy['authtype'] == 'ntlm') { $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM); } + if ($this->proxy['authtype'] == 'any') { + $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_ANY); + } } } $this->debug('cURL connection set up'); @@ -460,7 +474,7 @@ function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) { * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $digestRequest (keys must be nonce, nc, realm, qop) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public @@ -526,6 +540,9 @@ function setCredentials($username, $password, $authtype = 'basic', $digestReques } elseif ($authtype == 'ntlm') { // do nothing $this->debug('Authorization header not set for ntlm'); + } elseif ($authtype == 'any') { + // do nothing + $this->debug('Authorization header not set for any'); } $this->username = $username; $this->password = $password; @@ -570,7 +587,7 @@ function setEncoding($enc='gzip, deflate') { * @param string $proxyport * @param string $proxyusername * @param string $proxypassword - * @param string $proxyauthtype (basic|ntlm) + * @param string $proxyauthtype (basic|digest|ntlm|any) * @access public */ function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') { @@ -609,7 +626,9 @@ function isSkippableCurlHeader(&$data) { 'HTTP/1.1 302', 'HTTP/1.0 401', 'HTTP/1.1 401', - 'HTTP/1.0 200 Connection established'); + 'HTTP/1.0 200 Connection established', + 'HTTP/1.1 200 Connection established', + 'HTTP/1.1 307'); foreach ($skipHeaders as $hd) { $prefix = substr($data, 0, strlen($hd)); if ($prefix == $hd) return true; @@ -1090,8 +1109,13 @@ function getResponse(){ ($http_status >= 400 && $http_status <= 417) || ($http_status >= 501 && $http_status <= 505) ) { - $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); - return false; + if ($http_status == 403 && isset($this->incoming_headers['content-type']) && preg_match('/^text\/xml/i', $this->incoming_headers['content-type'])) { + // Amazon returns some faults with status 403, which is not per-SOAP 1.1 (http://www.w3.org/TR/2000/NOTE-SOAP-20000508/#_Toc478383529) + $this->debug('HTTP response status $http_status $http_reason with Content-Type: ' . $this->incoming_headers['content-type'] . ' is not per SOAP 1.1 spec, but try to process anyway'); + } else { + $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); + return false; + } } // decode content-encoding diff --git a/lib/class.soapclient.php b/lib/class.soapclient.php index 3361a03..23259fc 100644 --- a/lib/class.soapclient.php +++ b/lib/class.soapclient.php @@ -20,7 +20,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.soapclient.php,v 1.69 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.soapclient.php,v 1.72 2010/06/19 13:10:14 snichol Exp $ * @access public */ class nusoap_client extends nusoap_base { @@ -150,7 +150,7 @@ function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = f * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array * @param boolean $rpcParams optional (no longer used) * @param string $style optional (rpc|document) the style to use when serializing parameters (WSDL can override) - * @param string $use optional (encoded|literal|literal wrapped) the use when serializing parameters (WSDL can override) + * @param string $use optional (encoded|literal) the use when serializing parameters (WSDL can override) * @return mixed response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors * @access public */ @@ -205,7 +205,7 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $payload = $params; } elseif (is_array($params)) { $this->debug("serializing param array for WSDL operation $operation"); - $payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType); + $payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType,$this->portName); } else { $this->debug('params must be array or string'); $this->setError('params must be array or string'); @@ -228,8 +228,12 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc // operation not in WSDL $this->appendDebug($this->wsdl->getDebug()); $this->wsdl->clearDebug(); - $this->setError('operation '.$operation.' not present in WSDL.'); - $this->debug("operation '$operation' not present in WSDL."); + $errstr = 'operation '.$operation.' not present in WSDL'; + if ($this->portName != '') { + $errstr .= ' for port ' . $this->portName; + } + $this->setError($errstr); + $this->debug($errstr); return false; } else { // no WSDL @@ -237,15 +241,6 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $nsPrefix = 'ns' . rand(1000, 9999); // serialize $payload = ''; - if ($use = 'literal wrapped') { - // 'literal wrapped' is only sensible (and defined) for 'document'. - if ($style == 'document') { - $usewrapped = TRUE; - } - // For compatibility with the rest of the code: - $use = 'literal'; - } - if (is_string($params)) { $this->debug("serializing param string for operation $operation"); $payload = $params; @@ -266,18 +261,6 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $encodingStyle = ''; } } - // wrap document/literal wrapped calls with operation element - if (!empty($usewrapped)) { - // (This code block was based on http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/ - // and tailored to the needs of one specific SOAP server, where no nsPrefix was seen... - $this->debug("wrapping document request with literal method element"); - if ($namespace) { - $payload = "<$operation xmlns=\"$namespace\">" . - $payload . ""; - } else { - $payload = "<$operation>" . $payload . ""; - } - } // wrap RPC calls with method element if ($style == 'rpc') { if ($use == 'literal') { @@ -398,6 +381,7 @@ function loadWSDL() { $this->debug('instantiating wsdl class with doc: '.$this->wsdlFile); $this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl); $this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest); + $this->wsdl->charencoding = $this->charencoding; $this->wsdl->fetchWSDL($this->wsdlFile); $this->checkWSDL(); } @@ -640,7 +624,7 @@ function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypasswor * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public */ diff --git a/lib/class.wsdl.php b/lib/class.wsdl.php index b7ab216..d35df32 100644 --- a/lib/class.wsdl.php +++ b/lib/class.wsdl.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.wsdl.php,v 1.76 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.wsdl.php,v 1.85 2011/02/16 20:35:31 snichol Exp $ * @access public */ class wsdl extends nusoap_base { @@ -33,6 +33,7 @@ class wsdl extends nusoap_base { var $status = ''; var $documentation = false; var $endpoint = ''; + var $serviceDocumentation = ''; // array of wsdl docs to import var $import = array(); // parser vars @@ -109,13 +110,7 @@ function fetchWSDL($wsdl) { foreach ($xs->imports as $ns2 => $list2) { for ($ii = 0; $ii < count($list2); $ii++) { if (! $list2[$ii]['loaded']) { - /* - * Substituted with line below - * because of error "Warning: attempt to modify property of non-object" - * GitHub issue #1 - */ - //$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true; - $list2[$ii]['loaded'] = true; + $this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true; $url = $list2[$ii]['location']; if ($url != '') { $urlparts = parse_url($url); @@ -561,7 +556,7 @@ function character_data($parser, $data) * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public */ @@ -626,10 +621,11 @@ function getOperations($portName = '', $bindingType = 'soap') { * * @param string $operation name of operation * @param string $bindingType type of binding eg: soap, soap12 + * @param string $portName WSDL port name * @return array * @access public */ - function getOperationData($operation, $bindingType = 'soap') + function getOperationData($operation, $bindingType = 'soap', $portName = '') { if ($bindingType == 'soap') { $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/'; @@ -638,6 +634,7 @@ function getOperationData($operation, $bindingType = 'soap') } // loop thru ports foreach($this->ports as $port => $portData) { + if ($portName == '' || $port == $portName) { // binding type of port matches parameter if ($portData['bindingType'] == $bindingType) { // get binding @@ -650,6 +647,7 @@ function getOperationData($operation, $bindingType = 'soap') } } } + } } } @@ -658,10 +656,11 @@ function getOperationData($operation, $bindingType = 'soap') * * @param string $soapAction soapAction for operation * @param string $bindingType type of binding eg: soap, soap12 + * @param string $portName WSDL port name * @return array * @access public */ - function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { + function getOperationDataForSoapAction($soapAction, $bindingType = 'soap', $portName = '') { if ($bindingType == 'soap') { $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/'; } elseif ($bindingType == 'soap12') { @@ -669,6 +668,7 @@ function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { } // loop thru ports foreach($this->ports as $port => $portData) { + if ($portName == '' || $port == $portName) { // binding type of port matches parameter if ($portData['bindingType'] == $bindingType) { // loop through operations for the binding @@ -678,6 +678,7 @@ function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { } } } + } } } @@ -850,6 +851,7 @@ function popout(){ // Hides message

'.$this->serviceName.'
+

' . htmlspecialchars($this->serviceDocumentation, ENT_QUOTES) . '

View the WSDL for the service. Click on an operation name to view it's details.

    '; @@ -920,6 +922,10 @@ function serialize($debug = 0) } } } + // service documentation + if ($this->serviceDocumentation) { + $xml .= "\n\n" . $this->expandEntities($this->serviceDocumentation) . "\n"; + } // types if (count($this->schemas)>=1) { $xml .= "\n\n"; @@ -999,7 +1005,7 @@ function serialize($debug = 0) } $portType_xml .= '>'; if(isset($opParts['documentation']) && $opParts['documentation'] != '') { - $portType_xml .= "\n" . ' ' . htmlspecialchars($opParts['documentation']) . ''; + $portType_xml .= "\n" . ' ' . $this->expandEntities($opParts['documentation']) . ''; } $portType_xml .= "\n" . ' '; $portType_xml .= "\n" . ' '; @@ -1077,8 +1083,18 @@ function parametersMatchWrapped($type, &$parameters) { if (isset($typeDef['elements']) && is_array($typeDef['elements'])) { $elements = 0; $matches = 0; + $change = false; + if ($this->isArraySimpleOrStruct($parameters) == 'arraySimple' && count($parameters) == count($typeDef['elements'])) { + $this->debug("in parametersMatchWrapped: (wrapped return value kludge) correct number of elements in simple array, so change array and wrap"); + $change = true; + } foreach ($typeDef['elements'] as $name => $attrs) { - if (isset($parameters[$name])) { + if ($change) { + $this->debug("in parametersMatchWrapped: change parameter $elements to name $name"); + $parameters[$name] = $parameters[$elements]; + unset($parameters[$elements]); + $matches++; + } elseif (isset($parameters[$name])) { $this->debug("in parametersMatchWrapped: have parameter named $name"); $matches++; } else { @@ -1112,11 +1128,12 @@ function parametersMatchWrapped($type, &$parameters) { * @param string $direction (input|output) * @param mixed $parameters parameter value(s) * @param string $bindingType (soap|soap12) + * @param string $portName the WSDL port name * @return mixed parameters serialized as XML or false on error (e.g. operation not found) * @access public */ - function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') { - $this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType"); + function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap', $portName = '') { + $this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType, portName=$portName"); $this->appendDebug('parameters=' . $this->varDump($parameters)); if ($direction != 'input' && $direction != 'output') { @@ -1124,9 +1141,9 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp $this->setError('The value of the \$direction argument needs to be either "input" or "output"'); return false; } - if (!$opData = $this->getOperationData($operation, $bindingType)) { - $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType); - $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType); + if (!$opData = $this->getOperationData($operation, $bindingType, $portName)) { + $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); + $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); return false; } $this->debug('in serializeRPCParameters: opData:'); @@ -1139,7 +1156,7 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp $enc_style = $encodingStyle; } - // set input params + // set params $xml = ''; if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) { $parts = &$opData[$direction]['parts']; @@ -1155,11 +1172,21 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) { $this->debug('check whether the caller has wrapped the parameters'); if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) { - // TODO: consider checking here for double-wrapping, when - // service function wraps, then NuSOAP wraps again - $this->debug("change simple array to associative with 'parameters' element"); - $parameters['parameters'] = $parameters[0]; - unset($parameters[0]); + $this->debug('check whether caller\'s parameters match the wrapped ones'); + if (is_array($parameters[0]) && count($parameters[0]) == 1 && isset($parameters[0]['parameters'])) { + $this->debug('unwrap the parameters for the caller'); + $parameters = $parameters[0]; + //$parameter_count = 1; + } elseif ($this->parametersMatchWrapped($parts['parameters'], $parameters[0])) { + $this->debug('re-wrap the parameters for the caller'); + $parameters['parameters'] = $parameters[0]; + unset($parameters[0]); + //$parameter_count = 1; + } elseif ($this->parametersMatchWrapped($parts['parameters'], $parameters)) { + $this->debug('wrap the (kludged?) parameters for the caller'); + $parameters = array('parameters' => $parameters); + //$parameter_count = 1; + } } if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) { $this->debug('check whether caller\'s parameters match the wrapped ones'); @@ -1212,13 +1239,15 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp * @param string $operation operation name * @param string $direction (input|output) * @param mixed $parameters parameter value(s) + * @param string $bindingType (soap|soap12) + * @param string $portName the WSDL port name * @return mixed parameters serialized as XML or false on error (e.g. operation not found) * @access public * @deprecated */ - function serializeParameters($operation, $direction, $parameters) + function serializeParameters($operation, $direction, $parameters, $bindingType = 'soap', $portName = '') { - $this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion"); + $this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType, portName=$portname"); $this->appendDebug('parameters=' . $this->varDump($parameters)); if ($direction != 'input' && $direction != 'output') { @@ -1226,9 +1255,9 @@ function serializeParameters($operation, $direction, $parameters) $this->setError('The value of the \$direction argument needs to be either "input" or "output"'); return false; } - if (!$opData = $this->getOperationData($operation)) { - $this->debug('Unable to retrieve WSDL data for operation: ' . $operation); - $this->setError('Unable to retrieve WSDL data for operation: ' . $operation); + if (!$opData = $this->getOperationData($operation, $bindingType, $portName)) { + $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); + $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); return false; } $this->debug('opData:'); @@ -1292,17 +1321,28 @@ function serializeParameters($operation, $direction, $parameters) * @param string $use use for part (encoded|literal) * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style) * @param boolean $unqualified a kludge for what should be XML namespace form handling + * @param int $minOccurs the minOccurs attribute for an element + * @param boolean $nillable the nillable attribute for an element * @return string value serialized as an XML string * @access private */ - function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false) + function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false, $minOccurs=1, $nillable=false) { - $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified")); + $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified") . ", minOccurs=$minOccurs, nillable=" . ($nillable ? "true" : "false")); $this->appendDebug("value=" . $this->varDump($value)); if($use == 'encoded' && $encodingStyle) { $encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"'; } + if ($type == '!any') { + if (is_string($value)) { + $this->debug("in serializeType: returning any assuming it is literal: $value"); + return $value; + } + $this->debug("in serializeType: returning empty string because value for any is not string"); + return ''; + } + // if a soapval has been supplied, let its type override the WSDL if (is_object($value) && get_class($value) == 'soapval') { if ($value->type_ns) { @@ -1352,10 +1392,14 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs - $xml = "<$name$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS/>"; + } } else { - // TODO: depends on nillable, which should be checked before calling this method $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>"; } $this->debug("in serializeType: returning: $xml"); @@ -1472,8 +1516,13 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs and nillable - $xml = "<$elementName$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$elementName$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$elementName$elementNS/>"; + } } else { $xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>"; } @@ -1524,8 +1573,14 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs $xml = "<$name$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS/>"; + } } else { $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . @@ -1594,7 +1649,11 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals if ($forceType) { $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value"; } else { - $xml = "<$name$elementNS>$value"; + if(is_null($value)) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS>$value"; + } } } else { $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value"; @@ -1736,12 +1795,14 @@ function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='enco } else { $unqualified = false; } + $minOccurs = (int) (isset($attrs['minOccurs']) ? $attrs['minOccurs'] : '1'); + $nillable = isset($attrs['nillable']) && ($attrs['nillable'] == 'true'); if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') { $vv = $v; foreach ($vv as $k => $v) { if (isset($attrs['type']) || isset($attrs['ref'])) { // serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); + $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified, $minOccurs, $nillable); } else { // serialize generic type (can this ever really happen?) $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use"); @@ -1749,14 +1810,9 @@ function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='enco } } } else { - if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') { - // do nothing - } elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') { - // TODO: serialize a nil correctly, but for now serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); - } elseif (isset($attrs['type']) || isset($attrs['ref'])) { + if (isset($attrs['type']) || isset($attrs['ref'])) { // serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); + $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified, $minOccurs, $nillable); } else { // serialize generic type (can this ever really happen?) $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use"); @@ -1873,17 +1929,17 @@ function addOperation($name, $in = false, $out = false, $namespace = false, $soa if ($style == 'document') { $elements = array(); foreach ($in as $n => $t) { - $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified'); + $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'qualified'); } - $this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements); - $this->addElement(array('name' => $name, 'type' => $name . 'RequestType')); + $this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'sequence', '', $elements); + $this->addElement(array('name' => $name, 'type' => $name . 'RequestType', 'form' => 'qualified')); $in = array('parameters' => 'tns:' . $name . '^'); $elements = array(); foreach ($out as $n => $t) { - $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified'); + $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'qualified'); } - $this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements); + $this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'sequence', '', $elements); $this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified')); $out = array('parameters' => 'tns:' . $name . 'Response' . '^'); } @@ -1941,4 +1997,4 @@ function addOperation($name, $in = false, $out = false, $namespace = false, $soa } } -?> \ No newline at end of file +?> diff --git a/lib/class.xmlschema.php b/lib/class.xmlschema.php index 02866bf..2848859 100644 --- a/lib/class.xmlschema.php +++ b/lib/class.xmlschema.php @@ -9,7 +9,7 @@ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: class.xmlschema.php,v 1.53 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: class.xmlschema.php,v 1.57 2011/01/15 15:58:31 snichol Exp $ * @access public */ class nusoap_xmlschema extends nusoap_base { @@ -239,6 +239,15 @@ function schemaStartElement($parser, $name, $attrs) { // $this->complexTypes[$this->currentComplexType]['phpType'] = 'struct'; //} break; + case 'any': + if ($this->currentComplexType) { + $this->xdebug("add any pseudo-element to complexType $this->currentComplexType"); + $attrs['type'] = '!any'; + $this->complexTypes[$this->currentComplexType]['elements']['any'] = $attrs; + } else { + $this->xdebug("do nothing with any outside of complexType"); + } + break; case 'attribute': // complexType attribute //$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']); $this->xdebug("parsing attribute:"); @@ -377,6 +386,12 @@ function schemaStartElement($parser, $name, $attrs) { $this->xdebug("processing element as ref to ".$attrs['ref']); $this->currentElement = "ref to ".$attrs['ref']; $ename = $this->getLocalPart($attrs['ref']); + $ns = $this->getPrefix($attrs['ref']); + if (! $ns) { + $ns = $this->schemaTargetNamespace; + $this->xdebug("defaulted ref namespace to $ns"); + } + $attrs['ref'] = $ns . ':' . $ename; } else { $type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']); $this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type); @@ -574,7 +589,11 @@ function serializeSchema(){ if(isset($eParts['ref'])){ $contentStr .= " <$schemaPrefix:element ref=\"$element\"/>\n"; } else { - $contentStr .= " <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\""; + if ($element == 'any') { + $contentStr .= " contractQName($eParts['type']) . "\""; + } foreach ($eParts as $aName => $aValue) { // handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable if ($aName != 'name' && $aName != 'type') { diff --git a/lib/nusoap.php b/lib/nusoap.php index dac53a8..41b1637 100644 --- a/lib/nusoap.php +++ b/lib/nusoap.php @@ -1,7 +1,7 @@ * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_base { @@ -96,14 +96,14 @@ class nusoap_base { * @var string * @access private */ - var $version = '0.9.6'; + var $version = '0.9.6dev'; /** * CVS revision for HTTP headers. * * @var string * @access private */ - var $revision = '$Revision: 1.124 $'; + var $revision = '$Revision: 1.137 $'; /** * Current error string (manipulated by getError/setError) * @@ -148,8 +148,8 @@ class nusoap_base { * @var string * @access public */ - var $soap_defencoding = 'ISO-8859-1'; - //var $soap_defencoding = 'UTF-8'; + //var $soap_defencoding = 'ISO-8859-1'; + var $soap_defencoding = 'UTF-8'; /** * namespaces in an array of prefix => uri @@ -450,7 +450,7 @@ function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=fals if (is_null($val)) { $this->debug("serialize_val: serialize null"); if ($use == 'literal') { - // TODO: depends on minOccurs + // TODO: depends on minOccurs, nillable $xml = "<$name$xmlns$atts/>"; $this->debug("serialize_val returning $xml"); return $xml; @@ -902,6 +902,10 @@ function __toString() { * @access public */ function timestamp_to_iso8601($timestamp,$utc=true){ + if ($utc) { + return gmdate("Y-m-d\TH:i:s\Z", $timestamp); + } + $datestr = date('Y-m-d\TH:i:sO',$timestamp); $pos = strrpos($datestr, "+"); if ($pos === FALSE) { @@ -912,25 +916,7 @@ function timestamp_to_iso8601($timestamp,$utc=true){ $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2); } } - if($utc){ - $pattern = '/'. - '([0-9]{4})-'. // centuries & years CCYY- - '([0-9]{2})-'. // months MM- - '([0-9]{2})'. // days DD - 'T'. // separator T - '([0-9]{2}):'. // hours hh: - '([0-9]{2}):'. // minutes mm: - '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss... - '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's - '/'; - - if(preg_match($pattern,$datestr,$regs)){ - return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]); - } - return false; - } else { - return $datestr; - } + return $datestr; } /** @@ -1001,7 +987,7 @@ function usleepWindows($usec) * Mainly used for returning faults from deployed functions * in a server instance. * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_fault extends nusoap_base { @@ -1089,7 +1075,7 @@ class soap_fault extends nusoap_fault { * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_xmlschema extends nusoap_base { @@ -1319,6 +1305,15 @@ function schemaStartElement($parser, $name, $attrs) { // $this->complexTypes[$this->currentComplexType]['phpType'] = 'struct'; //} break; + case 'any': + if ($this->currentComplexType) { + $this->xdebug("add any pseudo-element to complexType $this->currentComplexType"); + $attrs['type'] = '!any'; + $this->complexTypes[$this->currentComplexType]['elements']['any'] = $attrs; + } else { + $this->xdebug("do nothing with any outside of complexType"); + } + break; case 'attribute': // complexType attribute //$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']); $this->xdebug("parsing attribute:"); @@ -1457,6 +1452,12 @@ function schemaStartElement($parser, $name, $attrs) { $this->xdebug("processing element as ref to ".$attrs['ref']); $this->currentElement = "ref to ".$attrs['ref']; $ename = $this->getLocalPart($attrs['ref']); + $ns = $this->getPrefix($attrs['ref']); + if (! $ns) { + $ns = $this->schemaTargetNamespace; + $this->xdebug("defaulted ref namespace to $ns"); + } + $attrs['ref'] = $ns . ':' . $ename; } else { $type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']); $this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type); @@ -1654,7 +1655,11 @@ function serializeSchema(){ if(isset($eParts['ref'])){ $contentStr .= " <$schemaPrefix:element ref=\"$element\"/>\n"; } else { - $contentStr .= " <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\""; + if ($element == 'any') { + $contentStr .= " contractQName($eParts['type']) . "\""; + } foreach ($eParts as $aName => $aValue) { // handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable if ($aName != 'name' && $aName != 'type') { @@ -2061,7 +2066,7 @@ class XMLSchema extends nusoap_xmlschema { * xsd:anyType and user-defined types. * * @author Dietrich Ayala -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class soapval extends nusoap_base { @@ -2163,7 +2168,7 @@ function decode(){ * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class soap_transport_http extends nusoap_base { @@ -2313,9 +2318,9 @@ function setURL($url) { * @access private */ function io_method() { - if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) + if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && ($this->authtype == 'ntlm' || $this->authtype == 'any')) || ($this->scheme == 'http' && is_array($this->proxy) && ($this->proxy['authtype'] == 'ntlm' || $this->proxy['authtype'] == 'any'))) return 'curl'; - if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) + if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && $this->authtype != 'any' && (!is_array($this->proxy) || ($this->proxy['authtype'] != 'ntlm' && $this->proxy['authtype'] != 'any'))) return 'socket'; return 'unknown'; } @@ -2369,9 +2374,9 @@ function connect($connection_timeout=0,$response_timeout=30){ // open socket if($connection_timeout > 0){ - $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout); + $this->fp = @fsockopen( $host, $port, $this->errno, $this->error_str, $connection_timeout); } else { - $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str); + $this->fp = @fsockopen( $host, $port, $this->errno, $this->error_str); } // test pointer @@ -2424,6 +2429,10 @@ function connect($connection_timeout=0,$response_timeout=30){ $CURLAUTH_NTLM = CURLAUTH_NTLM; else $CURLAUTH_NTLM = 8; + if (defined('CURLAUTH_ANY')) + $CURLAUTH_NTLM = CURLAUTH_ANY; + else + $CURLAUTH_NTLM = -17; $this->debug('connect using cURL'); // init CURL @@ -2526,6 +2535,10 @@ function connect($connection_timeout=0,$response_timeout=30){ $this->debug('set cURL for NTLM authentication'); $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM); } + if ($this->authtype == 'any') { + $this->debug('set cURL for ANY authentication'); + $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_ANY); + } } if (is_array($this->proxy)) { $this->debug('set cURL proxy options'); @@ -2540,9 +2553,15 @@ function connect($connection_timeout=0,$response_timeout=30){ if ($this->proxy['authtype'] == 'basic') { $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC); } + if ($this->proxy['authtype'] == 'digest') { + $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_DIGEST); + } if ($this->proxy['authtype'] == 'ntlm') { $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM); } + if ($this->proxy['authtype'] == 'any') { + $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_ANY); + } } } $this->debug('cURL connection set up'); @@ -2614,7 +2633,7 @@ function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) { * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $digestRequest (keys must be nonce, nc, realm, qop) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public @@ -2680,6 +2699,9 @@ function setCredentials($username, $password, $authtype = 'basic', $digestReques } elseif ($authtype == 'ntlm') { // do nothing $this->debug('Authorization header not set for ntlm'); + } elseif ($authtype == 'any') { + // do nothing + $this->debug('Authorization header not set for any'); } $this->username = $username; $this->password = $password; @@ -2724,7 +2746,7 @@ function setEncoding($enc='gzip, deflate') { * @param string $proxyport * @param string $proxyusername * @param string $proxypassword - * @param string $proxyauthtype (basic|ntlm) + * @param string $proxyauthtype (basic|digest|ntlm|any) * @access public */ function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') { @@ -2763,7 +2785,9 @@ function isSkippableCurlHeader(&$data) { 'HTTP/1.1 302', 'HTTP/1.0 401', 'HTTP/1.1 401', - 'HTTP/1.0 200 Connection established'); + 'HTTP/1.0 200 Connection established', + 'HTTP/1.1 200 Connection established', + 'HTTP/1.1 307'); foreach ($skipHeaders as $hd) { $prefix = substr($data, 0, strlen($hd)); if ($prefix == $hd) return true; @@ -3244,8 +3268,13 @@ function getResponse(){ ($http_status >= 400 && $http_status <= 417) || ($http_status >= 501 && $http_status <= 505) ) { - $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); - return false; + if ($http_status == 403 && isset($this->incoming_headers['content-type']) && preg_match('/^text\/xml/i', $this->incoming_headers['content-type'])) { + // Amazon returns some faults with status 403, which is not per-SOAP 1.1 (http://www.w3.org/TR/2000/NOTE-SOAP-20000508/#_Toc478383529) + $this->debug('HTTP response status $http_status $http_reason with Content-Type: ' . $this->incoming_headers['content-type'] . ' is not per SOAP 1.1 spec, but try to process anyway'); + } else { + $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); + return false; + } } // decode content-encoding @@ -3468,7 +3497,7 @@ function getCookiesForRequest($cookies, $secure=false) { * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_server extends nusoap_base { @@ -3594,6 +3623,18 @@ class nusoap_server extends nusoap_base { */ var $result = 'successful'; + /** + * dispatch map by operation element + * @var array + * @access private + */ + var $dispatchMapByOperationElement = array(); + /** + * dispatch map by SOAP Action + * @var array + * @access private + */ + var $dispatchMapBySOAPAction = array(); /** * assoc array of operations => opData; operations are added by the register() * method or by parsing an external WSDL definition @@ -3980,36 +4021,62 @@ function invoke_method() { $this->debug('in invoke_method, no WSDL to validate method'); } - // if a . is present in $this->methodname, we see if there is a class in scope, - // which could be referred to. We will also distinguish between two deliminators, - // to allow methods to be called a the class or an instance - if (strpos($this->methodname, '..') > 0) { - $delim = '..'; - } else if (strpos($this->methodname, '.') > 0) { - $delim = '.'; + // check for an explicit mapping + if (isset($this->dispatchMapByOperationElement[$orig_methodname])) { + $map = $this->dispatchMapByOperationElement[$orig_methodname]; + } elseif (isset($this->dispatchMapBySOAPAction[$this->SOAPAction])) { + $map = $this->dispatchMapBySOAPAction[$this->SOAPAction]; } else { - $delim = ''; - } - $this->debug("in invoke_method, delim=$delim"); - - $class = ''; - $method = ''; - if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) { - $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim)); - if (class_exists($try_class)) { - // get the class and method name - $class = $try_class; - $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim)); - $this->debug("in invoke_method, class=$class method=$method delim=$delim"); + $map = array(); + } + + if (count($map) > 0) { + // there is a mapping + if ($map['invoke_class'] != '') { + $class = $map['invoke_class']; + $delim = '..'; + } elseif ($map['invoke_class_instance'] != '') { + $class = $map['invoke_class_instance']; + $delim = '.'; } else { - $this->debug("in invoke_method, class=$try_class not found"); + $class = ''; + $delim = ''; } + $try_class = $class; + $method = $map['invoke_function']; } else { - $try_class = ''; - $this->debug("in invoke_method, no class to try"); + // if a . is present in $this->methodname, we see if there is a class in scope, + // which could be referred to. We will also distinguish between two deliminators, + // to allow methods to be called a the class or an instance + if (strpos($this->methodname, '..') > 0) { + $delim = '..'; + } else if (strpos($this->methodname, '.') > 0) { + $delim = '.'; + } else { + $delim = ''; + } + $this->debug("in invoke_method, delim=$delim"); + + $class = ''; + $method = ''; + if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) { + $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim)); + if (class_exists($try_class)) { + // get the class and method name + $class = $try_class; + $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim)); + $this->debug("in invoke_method, class=$class method=$method delim=$delim"); + } else { + $this->debug("in invoke_method, class=$try_class not found"); + } + } else { + $try_class = ''; + $this->debug("in invoke_method, no class to try"); + } } // does method exist? + // TODO: use ReflectionClass for newer PHP versions in this part of the code if ($class == '') { if (!function_exists($this->methodname)) { $this->debug("in invoke_method, function '$this->methodname' not found!"); @@ -4129,6 +4196,9 @@ function serialize_return() { // $this->debug('wrap in element named ' . $name); //} $opParams = array($this->methodreturn); + } else { + $this->debug('no output parts, but wrap the method return in a simple array anyway'); + $opParams = array($this->methodreturn); } $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams); $this->appendDebug($this->wsdl->getDebug()); @@ -4210,7 +4280,7 @@ function send_response() { if ($this->fault) { $payload = $this->fault->serialize(); $this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error"; - $this->outgoing_headers[] = "Status: 500 Internal Server Error"; + //$this->outgoing_headers[] = "Status: 500 Internal Server Error"; } else { $payload = $this->responseSOAP; // Some combinations of PHP+Web server allow the Status @@ -4401,6 +4471,75 @@ function add_to_map($methodname,$in,$out){ $this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out); } + /** + * add an operation dispatch mapping + * + * (either $operation_element OR $soap_action should be specified) + * (one or neither of $invoke_class or $invoke_class_instance should be specified) + * ($invoke_function must always be specified) + * + * NOTE: this is separate from the register() method to support interface-first + * development of services; that technique normally uses an external WSDL file, + * so register() is never called. + * + * @param string $operation_element The XML element for the operation + * @param string $soap_action The SOAP Action for the operation + * @param string $invoke_function The function or method to invoke + * @param string $invoke_class The class on which to invoke as a class method + * @param string $invoke_class_instance The class on which to invoke as an instance method + * @return boolean true if added, false if not + * @access public + */ + function addDispatchMap($operation_element, $soap_action, $invoke_function, $invoke_class, $invoke_class_instance) { + // massage parameters + if (!is_string($operation_element)) + $operation_element = ''; + if (!is_string($soap_action)) + $soap_action = ''; + if (!is_string($invoke_class)) + $invoke_class = ''; + if (!is_string($invoke_class_instance)) + $invoke_class_instance = ''; + if (!is_string($invoke_function)) + $invoke_function = ''; + + // validate parameters + if ($operation_element == '' && $soap_action == '') { + $this->debug('addDispatchMap: Neither operation_element nor soap_action specified'); + return false; + } + if ($operation_element != '' && $soap_action != '') { + $this->debug('addDispatchMap: Both operation_element and soap_action specified'); + return false; + } + if ($invoke_class != '' && $invoke_class_instance != '') { + $this->debug('addDispatchMap: Both invoke_class and invoke_class_instance specified'); + return false; + } + if ($invoke_function == '') { + $this->debug('addDispatchMap: No value provided for invoke_function'); + return false; + } + + // create the map + $map['operation_element'] = $operation_element; + $map['soap_action'] = $soap_action; + $map['invoke_class'] = $invoke_class; + $map['invoke_class_instance'] = $invoke_class_instance; + $map['invoke_function'] = $invoke_function; + + // add to the appropriate map hash + if ($operation_element != '') { + $this->dispatchMapByOperationElement[$operation_element] = $map; + $this->debug("addDispatchMap: Added map for operation_element $operation_element"); + } else { + $this->dispatchMapBySOAPAction[$soap_action] = $map; + $this->debug("addDispatchMap: Added map for soap_action $soap_action"); + } + + return true; + } + /** * register a service function with the server * @@ -4502,8 +4641,9 @@ function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){ * @param string $style optional (rpc|document) WSDL style (also specified by operation) * @param string $transport optional SOAP transport * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false + * @param string $serviceDocumentation documentation for the service */ - function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false) + function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false, $serviceDocumentation = '') { global $HTTP_SERVER_VARS; @@ -4543,6 +4683,10 @@ function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style= $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME"; } + if (false == $transport) { + $transport = 'http://schemas.xmlsoap.org/soap/http'; + } + if(false == $schemaTargetNamespace) { $schemaTargetNamespace = $namespace; } @@ -4550,6 +4694,7 @@ function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style= $this->wsdl = new wsdl; $this->wsdl->serviceName = $serviceName; $this->wsdl->endpoint = $endpoint; + $this->wsdl->serviceDocumentation = $serviceDocumentation; $this->wsdl->namespaces['tns'] = $namespace; $this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/'; $this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/'; @@ -4591,7 +4736,7 @@ class soap_server extends nusoap_server { * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class wsdl extends nusoap_base { @@ -4615,6 +4760,7 @@ class wsdl extends nusoap_base { var $status = ''; var $documentation = false; var $endpoint = ''; + var $serviceDocumentation = ''; // array of wsdl docs to import var $import = array(); // parser vars @@ -4691,13 +4837,7 @@ function fetchWSDL($wsdl) { foreach ($xs->imports as $ns2 => $list2) { for ($ii = 0; $ii < count($list2); $ii++) { if (! $list2[$ii]['loaded']) { - /* - * Substituted with line below - * because of error "Warning: attempt to modify property of non-object" - * GitHub issue #1 - */ - //$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true; - $list2[$ii]['loaded'] = true; + $this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true; $url = $list2[$ii]['location']; if ($url != '') { $urlparts = parse_url($url); @@ -5143,7 +5283,7 @@ function character_data($parser, $data) * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public */ @@ -5208,10 +5348,11 @@ function getOperations($portName = '', $bindingType = 'soap') { * * @param string $operation name of operation * @param string $bindingType type of binding eg: soap, soap12 + * @param string $portName WSDL port name * @return array * @access public */ - function getOperationData($operation, $bindingType = 'soap') + function getOperationData($operation, $bindingType = 'soap', $portName = '') { if ($bindingType == 'soap') { $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/'; @@ -5220,6 +5361,7 @@ function getOperationData($operation, $bindingType = 'soap') } // loop thru ports foreach($this->ports as $port => $portData) { + if ($portName == '' || $port == $portName) { // binding type of port matches parameter if ($portData['bindingType'] == $bindingType) { // get binding @@ -5232,6 +5374,7 @@ function getOperationData($operation, $bindingType = 'soap') } } } + } } } @@ -5240,10 +5383,11 @@ function getOperationData($operation, $bindingType = 'soap') * * @param string $soapAction soapAction for operation * @param string $bindingType type of binding eg: soap, soap12 + * @param string $portName WSDL port name * @return array * @access public */ - function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { + function getOperationDataForSoapAction($soapAction, $bindingType = 'soap', $portName = '') { if ($bindingType == 'soap') { $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/'; } elseif ($bindingType == 'soap12') { @@ -5251,6 +5395,7 @@ function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { } // loop thru ports foreach($this->ports as $port => $portData) { + if ($portName == '' || $port == $portName) { // binding type of port matches parameter if ($portData['bindingType'] == $bindingType) { // loop through operations for the binding @@ -5260,6 +5405,7 @@ function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') { } } } + } } } @@ -5432,6 +5578,7 @@ function popout(){ // Hides message

    '.$this->serviceName.'
    +

    ' . htmlspecialchars($this->serviceDocumentation, ENT_QUOTES) . '

    View the WSDL for the service. Click on an operation name to view it's details.

      '; @@ -5502,6 +5649,10 @@ function serialize($debug = 0) } } } + // service documentation + if ($this->serviceDocumentation) { + $xml .= "\n\n" . $this->expandEntities($this->serviceDocumentation) . "\n"; + } // types if (count($this->schemas)>=1) { $xml .= "\n\n"; @@ -5581,7 +5732,7 @@ function serialize($debug = 0) } $portType_xml .= '>'; if(isset($opParts['documentation']) && $opParts['documentation'] != '') { - $portType_xml .= "\n" . ' ' . htmlspecialchars($opParts['documentation']) . ''; + $portType_xml .= "\n" . ' ' . $this->expandEntities($opParts['documentation']) . ''; } $portType_xml .= "\n" . ' '; $portType_xml .= "\n" . ' '; @@ -5659,8 +5810,18 @@ function parametersMatchWrapped($type, &$parameters) { if (isset($typeDef['elements']) && is_array($typeDef['elements'])) { $elements = 0; $matches = 0; + $change = false; + if ($this->isArraySimpleOrStruct($parameters) == 'arraySimple' && count($parameters) == count($typeDef['elements'])) { + $this->debug("in parametersMatchWrapped: (wrapped return value kludge) correct number of elements in simple array, so change array and wrap"); + $change = true; + } foreach ($typeDef['elements'] as $name => $attrs) { - if (isset($parameters[$name])) { + if ($change) { + $this->debug("in parametersMatchWrapped: change parameter $elements to name $name"); + $parameters[$name] = $parameters[$elements]; + unset($parameters[$elements]); + $matches++; + } elseif (isset($parameters[$name])) { $this->debug("in parametersMatchWrapped: have parameter named $name"); $matches++; } else { @@ -5694,11 +5855,12 @@ function parametersMatchWrapped($type, &$parameters) { * @param string $direction (input|output) * @param mixed $parameters parameter value(s) * @param string $bindingType (soap|soap12) + * @param string $portName the WSDL port name * @return mixed parameters serialized as XML or false on error (e.g. operation not found) * @access public */ - function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') { - $this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType"); + function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap', $portName = '') { + $this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType, portName=$portName"); $this->appendDebug('parameters=' . $this->varDump($parameters)); if ($direction != 'input' && $direction != 'output') { @@ -5706,9 +5868,9 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp $this->setError('The value of the \$direction argument needs to be either "input" or "output"'); return false; } - if (!$opData = $this->getOperationData($operation, $bindingType)) { - $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType); - $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType); + if (!$opData = $this->getOperationData($operation, $bindingType, $portName)) { + $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); + $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); return false; } $this->debug('in serializeRPCParameters: opData:'); @@ -5721,7 +5883,7 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp $enc_style = $encodingStyle; } - // set input params + // set params $xml = ''; if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) { $parts = &$opData[$direction]['parts']; @@ -5737,11 +5899,21 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) { $this->debug('check whether the caller has wrapped the parameters'); if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) { - // TODO: consider checking here for double-wrapping, when - // service function wraps, then NuSOAP wraps again - $this->debug("change simple array to associative with 'parameters' element"); - $parameters['parameters'] = $parameters[0]; - unset($parameters[0]); + $this->debug('check whether caller\'s parameters match the wrapped ones'); + if (is_array($parameters[0]) && count($parameters[0]) == 1 && isset($parameters[0]['parameters'])) { + $this->debug('unwrap the parameters for the caller'); + $parameters = $parameters[0]; + //$parameter_count = 1; + } elseif ($this->parametersMatchWrapped($parts['parameters'], $parameters[0])) { + $this->debug('re-wrap the parameters for the caller'); + $parameters['parameters'] = $parameters[0]; + unset($parameters[0]); + //$parameter_count = 1; + } elseif ($this->parametersMatchWrapped($parts['parameters'], $parameters)) { + $this->debug('wrap the (kludged?) parameters for the caller'); + $parameters = array('parameters' => $parameters); + //$parameter_count = 1; + } } if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) { $this->debug('check whether caller\'s parameters match the wrapped ones'); @@ -5794,13 +5966,15 @@ function serializeRPCParameters($operation, $direction, $parameters, $bindingTyp * @param string $operation operation name * @param string $direction (input|output) * @param mixed $parameters parameter value(s) + * @param string $bindingType (soap|soap12) + * @param string $portName the WSDL port name * @return mixed parameters serialized as XML or false on error (e.g. operation not found) * @access public * @deprecated */ - function serializeParameters($operation, $direction, $parameters) + function serializeParameters($operation, $direction, $parameters, $bindingType = 'soap', $portName = '') { - $this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion"); + $this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType, portName=$portname"); $this->appendDebug('parameters=' . $this->varDump($parameters)); if ($direction != 'input' && $direction != 'output') { @@ -5808,9 +5982,9 @@ function serializeParameters($operation, $direction, $parameters) $this->setError('The value of the \$direction argument needs to be either "input" or "output"'); return false; } - if (!$opData = $this->getOperationData($operation)) { - $this->debug('Unable to retrieve WSDL data for operation: ' . $operation); - $this->setError('Unable to retrieve WSDL data for operation: ' . $operation); + if (!$opData = $this->getOperationData($operation, $bindingType, $portName)) { + $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); + $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType . ' portName: ' . $portName); return false; } $this->debug('opData:'); @@ -5874,17 +6048,28 @@ function serializeParameters($operation, $direction, $parameters) * @param string $use use for part (encoded|literal) * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style) * @param boolean $unqualified a kludge for what should be XML namespace form handling + * @param int $minOccurs the minOccurs attribute for an element + * @param boolean $nillable the nillable attribute for an element * @return string value serialized as an XML string * @access private */ - function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false) + function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false, $minOccurs=1, $nillable=false) { - $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified")); + $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified") . ", minOccurs=$minOccurs, nillable=" . ($nillable ? "true" : "false")); $this->appendDebug("value=" . $this->varDump($value)); if($use == 'encoded' && $encodingStyle) { $encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"'; } + if ($type == '!any') { + if (is_string($value)) { + $this->debug("in serializeType: returning any assuming it is literal: $value"); + return $value; + } + $this->debug("in serializeType: returning empty string because value for any is not string"); + return ''; + } + // if a soapval has been supplied, let its type override the WSDL if (is_object($value) && get_class($value) == 'soapval') { if ($value->type_ns) { @@ -5934,10 +6119,14 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs - $xml = "<$name$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS/>"; + } } else { - // TODO: depends on nillable, which should be checked before calling this method $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>"; } $this->debug("in serializeType: returning: $xml"); @@ -6054,8 +6243,13 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs and nillable - $xml = "<$elementName$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$elementName$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$elementName$elementNS/>"; + } } else { $xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>"; } @@ -6106,8 +6300,14 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals } if (is_null($value)) { if ($use == 'literal') { - // TODO: depends on minOccurs $xml = "<$name$elementNS/>"; + if ($minOccurs == 0) { + $xml = ''; + } elseif ($nillable) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS/>"; + } } else { $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . @@ -6176,7 +6376,11 @@ function serializeType($name, $type, $value, $use='encoded', $encodingStyle=fals if ($forceType) { $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value"; } else { - $xml = "<$name$elementNS>$value"; + if(is_null($value)) { + $xml = "<$name$elementNS xsi:nil=\"true\"/>"; + } else { + $xml = "<$name$elementNS>$value"; + } } } else { $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value"; @@ -6318,12 +6522,14 @@ function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='enco } else { $unqualified = false; } + $minOccurs = (int) (isset($attrs['minOccurs']) ? $attrs['minOccurs'] : '1'); + $nillable = isset($attrs['nillable']) && ($attrs['nillable'] == 'true'); if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') { $vv = $v; foreach ($vv as $k => $v) { if (isset($attrs['type']) || isset($attrs['ref'])) { // serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); + $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified, $minOccurs, $nillable); } else { // serialize generic type (can this ever really happen?) $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use"); @@ -6331,14 +6537,9 @@ function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='enco } } } else { - if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') { - // do nothing - } elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') { - // TODO: serialize a nil correctly, but for now serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); - } elseif (isset($attrs['type']) || isset($attrs['ref'])) { + if (isset($attrs['type']) || isset($attrs['ref'])) { // serialize schema-defined type - $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified); + $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified, $minOccurs, $nillable); } else { // serialize generic type (can this ever really happen?) $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use"); @@ -6455,17 +6656,17 @@ function addOperation($name, $in = false, $out = false, $namespace = false, $soa if ($style == 'document') { $elements = array(); foreach ($in as $n => $t) { - $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified'); + $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'qualified'); } - $this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements); - $this->addElement(array('name' => $name, 'type' => $name . 'RequestType')); + $this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'sequence', '', $elements); + $this->addElement(array('name' => $name, 'type' => $name . 'RequestType', 'form' => 'qualified')); $in = array('parameters' => 'tns:' . $name . '^'); $elements = array(); foreach ($out as $n => $t) { - $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified'); + $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'qualified'); } - $this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements); + $this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'sequence', '', $elements); $this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified')); $out = array('parameters' => 'tns:' . $name . 'Response' . '^'); } @@ -6532,7 +6733,7 @@ function addOperation($name, $in = false, $out = false, $namespace = false, $soa * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_parser extends nusoap_base { @@ -6608,9 +6809,12 @@ function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){ } } else { $this->debug('No encoding specified in XML declaration'); + $pos_end = strpos($xml, '?>', $pos_xml + 2); + $xml = substr($xml, 0, $pos_end) . " encoding=\"$encoding\"" . substr($xml, $pos_end); } } else { $this->debug('No XML declaration'); + $xml = "" . $xml; } $this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding); // Create an XML parser - why not xml_parser_create_ns? @@ -7183,7 +7387,7 @@ class soap_parser extends nusoap_parser { * * @author Dietrich Ayala * @author Scott Nichol -* @version $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $ +* @version $Id: nusoap.php,v 1.137 2011/02/28 18:06:39 snichol Exp $ * @access public */ class nusoap_client extends nusoap_base { @@ -7313,7 +7517,7 @@ function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = f * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array * @param boolean $rpcParams optional (no longer used) * @param string $style optional (rpc|document) the style to use when serializing parameters (WSDL can override) - * @param string $use optional (encoded|literal|literal wrapped) the use when serializing parameters (WSDL can override) + * @param string $use optional (encoded|literal) the use when serializing parameters (WSDL can override) * @return mixed response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors * @access public */ @@ -7368,7 +7572,7 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $payload = $params; } elseif (is_array($params)) { $this->debug("serializing param array for WSDL operation $operation"); - $payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType); + $payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType,$this->portName); } else { $this->debug('params must be array or string'); $this->setError('params must be array or string'); @@ -7391,8 +7595,12 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc // operation not in WSDL $this->appendDebug($this->wsdl->getDebug()); $this->wsdl->clearDebug(); - $this->setError('operation '.$operation.' not present in WSDL.'); - $this->debug("operation '$operation' not present in WSDL."); + $errstr = 'operation '.$operation.' not present in WSDL'; + if ($this->portName != '') { + $errstr .= ' for port ' . $this->portName; + } + $this->setError($errstr); + $this->debug($errstr); return false; } else { // no WSDL @@ -7400,15 +7608,6 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $nsPrefix = 'ns' . rand(1000, 9999); // serialize $payload = ''; - if ($use = 'literal wrapped') { - // 'literal wrapped' is only sensible (and defined) for 'document'. - if ($style == 'document') { - $usewrapped = TRUE; - } - // For compatibility with the rest of the code: - $use = 'literal'; - } - if (is_string($params)) { $this->debug("serializing param string for operation $operation"); $payload = $params; @@ -7429,18 +7628,6 @@ function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAc $encodingStyle = ''; } } - // wrap document/literal wrapped calls with operation element - if (!empty($usewrapped)) { - // (This code block was based on http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/ - // and tailored to the needs of one specific SOAP server, where no nsPrefix was seen... - $this->debug("wrapping document request with literal method element"); - if ($namespace) { - $payload = "<$operation xmlns=\"$namespace\">" . - $payload . ""; - } else { - $payload = "<$operation>" . $payload . ""; - } - } // wrap RPC calls with method element if ($style == 'rpc') { if ($use == 'literal') { @@ -7561,6 +7748,7 @@ function loadWSDL() { $this->debug('instantiating wsdl class with doc: '.$this->wsdlFile); $this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl); $this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest); + $this->wsdl->charencoding = $this->charencoding; $this->wsdl->fetchWSDL($this->wsdlFile); $this->checkWSDL(); } @@ -7803,7 +7991,7 @@ function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypasswor * * @param string $username * @param string $password - * @param string $authtype (basic|digest|certificate|ntlm) + * @param string $authtype (basic|digest|certificate|ntlm|any) * @param array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs) * @access public */