Release 1.21.00 - rebase advanced branch to current trunk

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

Author: giraffedata

Windows/win32_config.h

@@ -20,10 +20,12 @@
   #define XMLRPC_SOCKET SOCKET
   #define XMLRPC_HAVE_TIMEVAL 0
   #define XMLRPC_HAVE_TIMESPEC 0
+  #define XMLRPC_HAVE_PTHREAD 0
 #else
   #define XMLRPC_SOCKET int
   #define XMLRPC_HAVE_TIMEVAL 1
   #define XMLRPC_HAVE_TIMESPEC 1
+  #define XMLRPC_HAVE_PTHREAD 1
 #endif
 
 #if defined(_MSC_VER)

Windows/xmlrpc_win32_config.h

@@ -31,6 +31,8 @@
 /* From xmlrpc_amconfig.h */
 
 #define HAVE__STRICMP 1
+#define HAVE__STRTOUI64 1
+
 /* Name of package */
 #define PACKAGE "xmlrpc-c"
 /*----------------------------------*/
@@ -72,6 +74,7 @@
 #define HAVE_WCHAR_H 1
 #define HAVE_SYS_FILIO_H 0
 #define HAVE_SYS_IOCTL_H 0
+#define HAVE_SYS_SELECT_H 0
 
 #define VA_LIST_IS_ARRAY 0
 
@@ -126,6 +129,22 @@
   #define HAVE_TIMESPEC 1
 #endif
 
+#if MSVCRT
+  #define HAVE_WINDOWS_THREAD 1
+#else
+  #define HAVE_WINDOWS_THREAD 0
+#endif
+
+/* Some people have and use pthreads on Windows.  See
+   http://sourceware.org/pthreads-win32 .  For that case, we can set
+   HAVE_PTHREAD to 1.  The builder prefers to use pthreads if it has
+   a choice.
+*/
+#define HAVE_PTHREAD 0
+
+/* Note that the return value of XMLRPC_VSNPRINTF is int on Windows,
+   ssize_t on POSIX.
+*/
 #if MSVCRT
   #define XMLRPC_VSNPRINTF _vsnprintf
 #else
@@ -162,9 +181,27 @@
 #pragma warning(disable:4996)
 #endif
 
+#if HAVE_STRTOLL
+  # define XMLRPC_STRTOLL strtoll
+#elif HAVE_STRTOQ
+  # define XMLRPC_STRTOLL strtoq /* Interix */
+#elif HAVE___STRTOLL
+  # define XMLRPC_STRTOLL __strtoll /* HP-UX <= 11.11 */
+#elif HAVE__STRTOUI64
+  #define XMLRPC_STRTOLL _strtoui64  /* Windows MSVC */
+#endif
+
+#if HAVE_STRTOULL
+  # define XMLRPC_STRTOULL strtoull
+#elif HAVE_STRTOUQ
+  # define XMLRPC_STRTOULL strtouq /* Interix */
+#elif HAVE___STRTOULL
+  # define XMLRPC_STRTOULL __strtoull /* HP-UX <= 11.11 */
+#elif HAVE__STRTOUI64
+  #define XMLRPC_STRTOULL _strtoui64  /* Windows MSVC */
+#endif
+
 #define snprintf _snprintf
 #define popen _popen
-#define strtoll _strtoui64
-#define strtoull _strtoui64
 
 #endif

config.mk.in

@@ -189,6 +189,10 @@ ifeq ($(patsubst solaris%,solaris,$(HOST_OS)),solaris)
   SHLIB_SUFFIX = so
   shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+  # We assume Sun compiler and linker here.  It isn't clear what to do
+  # about a user who uses GNU compiler and Ld instead.  For that, the
+  # options should be the same as "linux-gnu" platform, above.
+
   # Solaris compiler (Sun C 5.5) can't take multiple ld options as
   # -Wl,-a,-b .  Ld sees -a,-b in that case.
   LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
@@ -249,6 +253,18 @@ ifeq ($(patsubst freebsd%,freebsd,$(HOST_OS)),freebsd)
   NEED_WL_RPATH=yes
 endif
 
+ifeq ($(findstring interix,$(HOST_OS)),interix)
+  SHARED_LIB_TYPE = unix
+  SHLIB_SUFFIX = so
+  MUST_BUILD_SHLIB = Y
+  MUST_BUILD_SHLIBLE = Y
+  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+  shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+  CFLAGS_SHLIB =
+  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
+  NEED_WL_RPATH=yes
+endif
+
 ifeq ($(patsubst dragonfly%,dragonfly,$(HOST_OS)),dragonfly)
   SHARED_LIB_TYPE = unix
   MUST_BUILD_SHLIB = Y

configure.in

@@ -306,6 +306,14 @@ else
 fi
 AC_SUBST(HAVE_SYS_IOCTL_H_DEFINE)
 
+AC_CHECK_HEADERS(sys/select.h)
+if test x"$ac_cv_header_sys_select_h" = xyes; then
+  HAVE_SYS_SELECT_H_DEFINE=1
+else
+  HAVE_SYS_SELECT_H_DEFINE=0
+fi
+AC_SUBST(HAVE_SYS_SELECT_H_DEFINE)
+
 
 AC_CHECK_HEADERS(stdarg.h, , [
 AC_MSG_ERROR(stdarg.h is required to build this library)
@@ -363,7 +371,7 @@ AC_CHECK_FUNCS(setgroups)
 
 AC_CHECK_FUNCS(asprintf)
 
-AC_CHECK_FUNCS(setenv)
+AC_CHECK_FUNCS(setenv strtoll strtoull strtoq strtouq __strtoll __strtoull)
 
 dnl uclib doesn't have pselect
 AC_CHECK_FUNCS(pselect)

include/Makefile

@@ -36,10 +36,12 @@ xmlrpc-c/config.h: $(BLDDIR)/$(SUBDIR)/xmlrpc-c
 	@echo '  #define XMLRPC_SOCKET SOCKET'                            >>$@
 	@echo '  #define XMLRPC_HAVE_TIMEVAL 0'                           >>$@
 	@echo '  #define XMLRPC_HAVE_TIMESPEC 0'                          >>$@
+	@echo '  #define XMLRPC_HAVE_PTHREAD 0'                           >>$@
 	@echo '#else'                                                     >>$@
 	@echo '  #define XMLRPC_SOCKET int'                               >>$@
 	@echo '  #define XMLRPC_HAVE_TIMEVAL 1'                           >>$@
 	@echo '  #define XMLRPC_HAVE_TIMESPEC 1'                          >>$@
+	@echo '  #define XMLRPC_HAVE_PTHREAD 1'                           >>$@
 	@echo '#endif'                                                    >>$@
 	@echo ''                                                          >>$@
 	@echo '#if defined(_MSC_VER)'                                     >>$@

include/xmlrpc-c/base.h

@@ -379,8 +379,8 @@ xmlrpc_struct_new(xmlrpc_env * const env);
 /* Return the number of key/value pairs in a struct.
 ** Sets XMLRPC_TYPE_ERROR if 'strct' is not a struct. */
 int
-xmlrpc_struct_size (xmlrpc_env   * env, 
-                    xmlrpc_value * strct);
+xmlrpc_struct_size (xmlrpc_env   * const env, 
+                    xmlrpc_value * const strct);
 
 /* Returns true iff 'strct' contains 'key'.
 ** Sets XMLRPC_TYPE_ERROR if 'strct' is not a struct. */

include/xmlrpc-c/base_int.h

@@ -117,7 +117,7 @@ xmlrpc_typeName(xmlrpc_type const type);
 void
 xmlrpc_traceXml(const char * const label, 
                 const char * const xml,
-                unsigned int const xmlLength);
+                size_t       const xmlLength);
 
 void
 xmlrpc_destroyString(xmlrpc_value * const stringP);

include/xmlrpc-c/client.h

@@ -71,6 +71,7 @@ struct xmlrpc_curl_xportparms {
     const char * egdsocket;
     const char * ssl_cipher_list;
     unsigned int timeout;
+    xmlrpc_bool dont_advertise;
 };
 
 

include/xmlrpc-c/client_transport.hpp

@@ -256,6 +256,7 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
         constrOpt & network_interface (std::string  const& arg);
         constrOpt & no_ssl_verifypeer (bool         const& arg);
         constrOpt & no_ssl_verifyhost (bool         const& arg);
+        constrOpt & dont_advertise    (bool         const& arg);
         constrOpt & user_agent        (std::string  const& arg);
         constrOpt & ssl_cert          (std::string  const& arg);
         constrOpt & sslcerttype       (std::string  const& arg);
@@ -277,6 +278,7 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
             std::string  network_interface;
             bool         no_ssl_verifypeer;
             bool         no_ssl_verifyhost;
+            bool         dont_advertise;
             std::string  user_agent;
             std::string  ssl_cert;
             std::string  sslcerttype;
@@ -298,6 +300,7 @@ class clientXmlTransport_curl : public xmlrpc_c::clientXmlTransport_http {
             bool network_interface;
             bool no_ssl_verifypeer;
             bool no_ssl_verifyhost;
+            bool dont_advertise;
             bool user_agent;
             bool ssl_cert;
             bool sslcerttype;

include/xmlrpc-c/girmem.hpp

@@ -1,6 +1,7 @@
 #ifndef GIRMEM_HPP_INCLUDED
 #define GIRMEM_HPP_INCLUDED
 
+#include <xmlrpc-c/config.h>
 
 /* The following pthread crap mirrors what is in pthreadx.h, which is
    what girmem.cpp uses to declare the lock interface.  We can't simply
@@ -15,7 +16,7 @@
    a pthread_mutex_t member, and on Windows, there's no such type.
 */
 
-#ifndef WIN32
+#if XMLRPC_HAVE_PTHREAD
 #  include <pthread.h>
    typedef pthread_mutex_t girmem_lock;
 #else

include/xmlrpc-c/inttypes.h

@@ -9,6 +9,9 @@ typedef unsigned __int64  xmlrpc_uint64_t;
 
 #else
 #include <inttypes.h>
+#ifdef __INTERIX
+#  include <stdint.h>
+#endif
 
 typedef uint16_t xmlrpc_uint16_t;
 typedef uint32_t xmlrpc_uint32_t;

include/xmlrpc-c/select_int.h

@@ -1,7 +1,7 @@
 #ifndef SELECT_INT_H_INCLUDED
 #define SELECT_INT_H_INCLUDED
 
-#ifndef WIN32
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #include <signal.h>

include/xmlrpc-c/server_abyss.hpp

@@ -67,8 +67,10 @@ class serverAbyss {
     void
     runConn(int const socketFd);
 
+#ifndef WIN32
     void
     sigchld(pid_t pid);
+#endif
 
     void
     terminate();

lib/abyss/src/socket_unix.c

@@ -262,7 +262,7 @@ channelWait(TChannel * const channelP,
    one.
 
    We return before the requested condition holds if 'timeoutMs'
-   milliseconds pass.  timoutMs == TIME_INFINITE means infinity.
+   milliseconds pass.  timeoutMs == TIME_INFINITE means infinity.
 
    We return before the requested condition holds if the process receives
    (and catches) a signal, but only if it receives that signal a certain

lib/curl_transport/curlmulti.c

@@ -14,7 +14,7 @@
 #include "xmlrpc_config.h"
 
 #include <stdlib.h>
-#if !MSVCRT
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif