Release 01.23.00

git-svn-id: https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced@1953 adbb7d4b-a73a-0410-a071-c5f57c452bd4

Author: giraffedata

configure.in

@@ -467,9 +467,6 @@ if test $MUST_BUILD_WININET_CLIENT = yes; then
     WININET_LDADD="`$WININET_CONFIG --libs`"
     AC_SUBST(WININET_LDADD)
 
-    dnl Oh, such massive brain damage! Because there may be another copy
-    dnl of libwww in the default dynamic loader search path, we need to
-    dnl adjust the search patch manually. Just gag me with a backquote, OK?
     AC_MSG_CHECKING(for wininet library directory)
     if $WININET_CONFIG --rpath-dir > /dev/null 2>&1; then
        dnl Yay! We're using our smart version of wininet.
@@ -538,9 +535,6 @@ if test $MUST_BUILD_LIBWWW_CLIENT = yes; then
     LIBWWW_LDADD="`$LIBWWW_CONFIG --libs`"
     AC_SUBST(LIBWWW_LDADD)
 
-    dnl Oh, such massive brain damage! Because there may be another copy
-    dnl of libwww in the default dynamic loader search path, we need to
-    dnl adjust the search patch manually. Just gag me with a backquote, OK?
     AC_MSG_CHECKING(for libwww library directory)
     if $LIBWWW_CONFIG --rpath-dir > /dev/null 2>&1; then
        dnl Yay! We're using our smart version of libwww.
@@ -567,12 +561,12 @@ fi # MUST_BUILD_LIBWWW_CLIENT
 
 
 dnl =======================================================================
-dnl Finding cURL
+dnl Finding Curl
 dnl =======================================================================
 
 if test $MUST_BUILD_CURL_CLIENT = yes; then
 
-    dnl First of all, locate the curl config program.
+    dnl First of all, locate the Curl config program.
     dnl You can control which of these gets chosen by fooling around with PATH.
     AC_PATH_PROGS(CURL_CONFIG, curl-xmlrpc-config curl-config, no)
     if test "x$CURL_CONFIG" = "xno"; then
@@ -581,7 +575,7 @@ if test $MUST_BUILD_CURL_CLIENT = yes; then
 
     dnl There used to be code here to check the Curl version and make sure
     dnl it is at least 7.8.  But there were bugs both in the code and in 
-    dnl curl (curl-config --vernum, at least in older versios of Curl,
+    dnl curl (curl-config --vernum, at least in older versions of Curl,
     dnl omits the leading zero).  So it didn't work.  Plus, checking version
     dnl numbers isn't a good idea.  Better to check for feature presence.
     dnl So we don't do any check now.  If we find out there's a problem with
@@ -594,11 +588,9 @@ if test $MUST_BUILD_CURL_CLIENT = yes; then
     CURL_LDADD=`$CURL_CONFIG --libs`
     AC_SUBST(CURL_LDADD)
 
-    dnl Oh, such massive brain damage! Because there may be another copy
-    dnl of curl in the default dynamic loader search path, we need to
-    dnl adjust the search path manually. Just gag me with a backquote, OK?
-    AC_MSG_CHECKING(for curl library directory)
-    dnl Yawn. We're using the regular boring version.
+    AC_MSG_CHECKING(for Curl library directory)
+    dnl Curl-config doesn't know about rpath, so we just make some
+    dnl assumptions:
     CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib"
 
     AC_MSG_RESULT($CURL_LIBDIR)

doc/INSTALL

@@ -119,6 +119,10 @@ by modifying the file 'config.mk' after 'configure' creates it.  The default
 value of these variables (as set in 'config.mk') is the same compile and link
 commands as for building target code.
 
+(There is probably a way to do this with GNU Autoconf facilities and avoid the
+BUILDTOOL_CC complication.  If you know how (without using Automake), tell the
+Xmlrpc-c maintainer and he will change the build system to use it).
+
 
 COMMON PROBLEMS
 ---------------

examples/cpp/xmlrpc_sample_add_server.cpp

@@ -62,10 +62,9 @@ main(int           const,
         myRegistry.addMethod("sample.add", sampleAddMethodP);
 
         xmlrpc_c::serverAbyss myAbyssServer(
-            myRegistry,
-            8080,              // TCP port on which to listen
-            "/tmp/xmlrpc_log"  // Log file
-            );
+            xmlrpc_c::serverAbyss::constrOpt()
+            .registryP(&myRegistry)
+            .portNumber(8080));
 
         myAbyssServer.run();
         // xmlrpc_c::serverAbyss.run() never returns

examples/json.c

@@ -6,6 +6,7 @@
   XML-RPC XML text.  It then re-generates JSON from the intermediate
   parsed information and displays that.
 */
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <xmlrpc-c/json.h>

examples/xmlrpc_sample_add_client.c

@@ -1,7 +1,10 @@
-/* A simple synchronous XML-RPC client written in C, as an example of
-   an Xmlrpc-c client.  This invokes the sample.add procedure that the
-   Xmlrpc-c example server.c server provides.  I.e. it adds two numbers
-   together, the hard way.
+/* A simple synchronous XML-RPC client written in C, as an example of an
+   Xmlrpc-c client.  This invokes the sample.add procedure that the Xmlrpc-c
+   example xmlrpc_sample_add_server.c server provides.  I.e. it adds two
+   numbers together, the hard way.
+
+   This sends the RPC to the server running on the local system ("localhost"),
+   HTTP Port 8080.
 */
 
 #include <stdlib.h>

examples/xmlrpc_sample_add_server.c

@@ -1,5 +1,25 @@
 /* A simple standalone XML-RPC server written in C. */
 
+/* This server knows one RPC class (besides the system classes):
+   "sample.add".
+
+   The program takes one argument: the HTTP port number on which the server
+   is to accept connections, in decimal.
+
+   You can use the example program 'xmlrpc_sample_add_client' to send an RPC
+   to this server.
+
+   Example:
+
+   $ ./xmlrpc_sample_add_server 8080&
+   $ ./xmlrpc_sample_add_client
+
+   For more fun, run client and server in separate terminals and turn on
+   tracing for each:
+
+   $ export XMLRPC_TRACE_XML=1
+*/
+
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef WIN32

include/Makefile

@@ -47,9 +47,11 @@ xmlrpc-c/config.h: $(BLDDIR)/$(SUBDIR)/xmlrpc-c
 	@echo '#if defined(_MSC_VER)'                                     >>$@
 	@echo '  /* Newer MSVC has long long, but MSVC 6 does not */'     >>$@
 	@echo '  #define XMLRPC_INT64 __int64'				  >>$@
+	@echo '  #define XMLRPC_PRId64 "I64"'                             >>$@
 	@echo '  #define XMLRPC_INT32 __int32'				  >>$@
 	@echo '#else'							  >>$@
 	@echo '  #define XMLRPC_INT64 long long'	                  >>$@
+	@echo '  #define XMLRPC_PRId64 "lld"'                             >>$@
 	@echo '  #define XMLRPC_INT32 int'		                  >>$@
 	@echo '#endif'                                                    >>$@
 	@echo '#endif'                                                    >>$@
@@ -133,9 +135,11 @@ install-compat-hdr: install-headers
 .PHONY: install
 install: install-common install-compat-hdr
 
-.PHONY: clean distclean dep
+.PHONY: clean
 clean:
 	rm -f xmlrpc-c/config.h
+
+.PHONY: distclean
 distclean: clean
 
 .PHONY: check

include/xmlrpc-c/client.h

@@ -10,6 +10,7 @@
 #ifndef  XMLRPC_CLIENT_H_INCLUDED
 #define  XMLRPC_CLIENT_H_INCLUDED
 
+#include <stdarg.h>
 #include <xmlrpc-c/base.h>
 
 #ifdef __cplusplus
@@ -50,6 +51,29 @@ enum xmlrpc_sslversion {
     XMLRPC_SSLVERSION_SSLv3
 };
 
+
+enum xmlrpc_httpauthtype {
+    /* These are just constants.  They can be or'ed as integers to create
+       a set.
+    */
+    XMLRPC_HTTPAUTH_BASIC         = (1<<0),
+    XMLRPC_HTTPAUTH_DIGEST        = (1<<1),
+    XMLRPC_HTTPAUTH_GSSNEGOTIATE  = (1<<2),
+    XMLRPC_HTTPAUTH_NTLM          = (1<<3), 
+};
+
+/* The following are useful combinations of the HTTP authentication types
+   above.
+*/
+#define XMLRPC_HTTPAUTH_NONE 0
+#define XMLRPC_HTTPAUTH_ANY  ~0
+#define XMLRPC_HTTPAUTH_ANYSAFE (~XMLRPC_HTTPAUTH_BASIC)
+
+enum xmlrpc_httpproxytype {
+    XMLRPC_HTTPPROXY_HTTP   = 0,
+    XMLRPC_HTTPPROXY_SOCKS5 = 5
+};
+
 struct xmlrpc_curl_xportparms {
     /* This is designed so that zero values are always the defaults. */
     const char * network_interface;
@@ -72,6 +96,14 @@ struct xmlrpc_curl_xportparms {
     const char * ssl_cipher_list;
     unsigned int timeout;
     xmlrpc_bool dont_advertise;
+    const char * proxy;
+    unsigned int proxy_port;
+    enum xmlrpc_httpproxytype proxy_type;
+    unsigned int proxy_auth;
+        /* A set of authentication schemes -- an OR of
+           enum xmlrpc_httpproxyauth values
+        */
+    const char * proxy_userpwd;
 };
 
 
@@ -252,6 +284,15 @@ xmlrpc_client_call2f(xmlrpc_env *    const envP,
                      const char *    const format,
                      ...);
 
+void
+xmlrpc_client_call2f_va(xmlrpc_env *               const envP,
+                        xmlrpc_client *            const clientP,
+                        const char *               const serverUrl,
+                        const char *               const methodName,
+                        const char *               const format,
+                        xmlrpc_value **            const resultPP,
+                        va_list                          args);
+
 void 
 xmlrpc_client_event_loop_finish(xmlrpc_client * const clientP);
 
@@ -260,13 +301,13 @@ xmlrpc_client_event_loop_finish_timeout(xmlrpc_client * const clientP,
                                         unsigned long   const milliseconds);
 
 void
-xmlrpc_client_start_rpc(xmlrpc_env *             const envP,
-                        struct xmlrpc_client *   const clientP,
-                        xmlrpc_server_info *     const serverInfoP,
-                        const char *             const methodName,
-                        xmlrpc_value *           const argP,
-                        xmlrpc_response_handler        responseHandler,
-                        void *                   const userData);
+xmlrpc_client_start_rpc(xmlrpc_env *               const envP,
+                        struct xmlrpc_client *     const clientP,
+                        const xmlrpc_server_info * const serverInfoP,
+                        const char *               const methodName,
+                        xmlrpc_value *             const argP,
+                        xmlrpc_response_handler          responseHandler,
+                        void *                     const userData);
 
 void 
 xmlrpc_client_start_rpcf(xmlrpc_env *    const envP,
@@ -278,6 +319,16 @@ xmlrpc_client_start_rpcf(xmlrpc_env *    const envP,
                          const char *    const format,
                          ...);
 
+void
+xmlrpc_client_start_rpcf_va(xmlrpc_env *    const envP,
+                            xmlrpc_client * const clientP,
+                            const char *    const serverUrl,
+                            const char *    const methodName,
+                            xmlrpc_response_handler responseHandler,
+                            void *          const userData,
+                            const char *    const format,
+                            va_list               args);
+
 void
 xmlrpc_client_set_interrupt(xmlrpc_client * const clientP,
                             int *           const interruptP);

include/xmlrpc-c/client.hpp

@@ -211,16 +211,18 @@ class rpc : public clientTransaction {
    An RPC.  An RPC consists of method name, parameters, and result.  It
    does not specify in any way how the method name and parameters get
    turned into a result.  It does not presume XML or HTTP.
-
-   You don't create an object of this class directly.  All references to
-   an rpc object should be by an rpcPtr object.  Create a new RPC by
-   creating a new rpcPtr.  Accordingly, our constructors and destructors
-   are protected, but available to our friend class rpcPtr.
-
+  
+   You don't normally create or reference an object of this class directly,
+   but rather via an 'rpcPtr' object.  That takes care of deleting the object
+   when you are done with it (but not before).  This is critical if you plan
+   to use the 'start' method, because without an rpcPtr reference, the system
+   will destroy the object under the covers when the RPC finishes, and there
+   is no way for you to guarantee you won't still access it after it finishes
+   (because of accesses within Xmlrpc-c calls such as the call that finishes
+   the RPC or just rpc::start).
+ 
    In order to do asynchronous RPCs, you normally have to create a derived
-   class that defines a useful notifyComplete().  If you do that, you'll
-   want to make sure the derived class objects get accessed only via rpcPtrs
-   as well.
+   class that defines a useful notifyComplete().
 -----------------------------------------------------------------------------*/
     friend class xmlrpc_c::rpcPtr;
 

include/xmlrpc-c/client_int.h

@@ -86,6 +86,35 @@ xmlrpc_client_event_loop_end (void);
 extern int
 xmlrpc_client_asynch_calls_are_unfinished (void);
 
+
+
+/*=========================================================================
+** Interface between global client and general client functions.
+** (These are necessary because there are some global client functions
+** that don't have exported private client versions because we don't like
+** them and have them for global functions only for backward compatibility.
+** The global client functions existed before any private client ones did).
+**========================================================================= */
+void
+xmlrpc_client_call_server2_va(xmlrpc_env *               const envP,
+                              struct xmlrpc_client *     const clientP,
+                              const xmlrpc_server_info * const serverInfoP,
+                              const char *               const methodName,
+                              const char *               const format,
+                              va_list                          args,
+                              xmlrpc_value **            const resultPP);
+
+void
+xmlrpc_client_start_rpcf_server_va(
+    xmlrpc_env *               const envP,
+    struct xmlrpc_client *     const clientP,
+    const xmlrpc_server_info * const serverInfoP,
+    const char *               const methodName,
+    xmlrpc_response_handler responseHandler,
+    void *                     const userData,
+    const char *               const format,
+    va_list                    args);
+
 /* Copyright (C) 2001 by First Peer, Inc. All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without

include/xmlrpc-c/client_transport.hpp

@@ -273,6 +273,11 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
         constrOpt & egdsocket         (std::string  const& arg);
         constrOpt & ssl_cipher_list   (std::string  const& arg);
         constrOpt & timeout           (unsigned int const& arg);
+        constrOpt & proxy             (std::string  const& arg);
+        constrOpt & proxy_port        (unsigned int const& arg);
+        constrOpt & proxy_auth        (unsigned int const& arg);
+        constrOpt & proxy_userpwd     (std::string  const& arg);
+        constrOpt & proxy_type        (xmlrpc_httpproxytype const& arg);
 
         struct {
             std::string  network_interface;
@@ -295,6 +300,11 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
             std::string  egdsocket;
             std::string  ssl_cipher_list;
             unsigned int timeout;
+            std::string  proxy;
+            unsigned int proxy_auth;
+            unsigned int proxy_port;
+            std::string  proxy_userpwd;
+            xmlrpc_httpproxytype proxy_type;
         } value;
         struct {
             bool network_interface;
@@ -317,6 +327,11 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
             bool egdsocket;
             bool ssl_cipher_list;
             bool timeout;
+            bool proxy;
+            bool proxy_auth;
+            bool proxy_port;
+            bool proxy_userpwd;
+            bool proxy_type;
         } present;
     };
 

include/xmlrpc-c/util.h

@@ -4,7 +4,10 @@
 
   This is the interface to the libxmlrpc_util library, which contains
   utility routines that have nothing to do with XML-RPC.  The library
-  exists because other Xmlrpc-c libraries use the utilities.
+  exists primarily because other Xmlrpc-c libraries use the utilities,
+  but the utilities are also documented for use by Xmlrpc-c users.
+  For use by Xmlrpc-c users, they are considered to be part of the
+  libxmlrpc library.  libxmlrpc_util is a prerequisite of libxmlrpc.
 
   By Bryan Henderson, San Jose, CA 05.09.21.
 
@@ -140,7 +143,7 @@ void
 xmlrpc_set_fault_formatted_v(xmlrpc_env * const envP,
                              int          const code,
                              const char * const format,
-                             va_list      const args);
+                             va_list            args);
 
 /* The same as the above, but using a printf-style format string. */
 void