Release 1.17.07

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

Author: giraffedata

common.mk

@@ -262,7 +262,7 @@ endif
 CFLAGS_ALL = $(CFLAGS_COMMON) $(CFLAGS_LOCAL) $(CFLAGS) \
   $(INCLUDES) $(CFLAGS_PERSONAL) $(CADD)
 
-CXXFLAGS_ALL = $(CFLAGS_COMMON) $(CFLAGS_LOCAL) $(CXXFLAGS) \
+CXXFLAGS_ALL = $(CXXFLAGS_COMMON) $(CFLAGS_LOCAL) $(CXXFLAGS) \
   $(INCLUDES) $(CFLAGS_PERSONAL) $(CADD)
 
 

config.mk.in

@@ -284,8 +284,8 @@ ifeq ($(HOST_OS),cygwin)
   MUST_BUILD_SHLIB = Y
   MUST_BUILD_SHLIBLE = N
   SHLIB_SUFFIX = dll
-  shlibfn = $(1:lib%=$(SHLIB_PREFIX)%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
-  shliblefn = $(1:%=%.shlibledummy)
+  shlibfn = $(1:%=%.$(SHLIB_SUFFIX))
+  shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
   LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
 endif
 

include/xmlrpc-c/base.h

@@ -8,12 +8,16 @@
 #include <time.h>
 #include <xmlrpc-c/util.h>
 #include <xmlrpc-c/config.h>
-  /* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64 */
+  /* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64, XMLRPC_HAVE_TIMEVAL */
 
 #if XMLRPC_HAVE_WCHAR
 #include <wchar.h>
 #endif
 
+#if XMLRPC_HAVE_TIMEVAL
+#include <sys/time.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

lib/abyss/src/Makefile

@@ -64,20 +64,16 @@ ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss)
 
 LIBDEP = $(LIBXMLRPC_UTIL)
 
-ifneq ($(SHARED_LIB_TYPE),NONE)
-  TARGET_SHARED_LIBS := $(ABYSS_SHLIB) $(ABYSS_SHLIBLE)
-  endif
-
 # This 'common.mk' dependency makes sure the symlinks get built before
 # this make file is used for anything.
 
 $(SRCDIR)/common.mk: srcdir blddir
 
 .PHONY: all
-all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
+all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS)
 
 
-# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
+# Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES
 $(ABYSS_SHLIB): $(TARGET_MODS:%=%.osh) $(LIBDEP)
 $(ABYSS_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh) $(LIBDEP)
 

lib/abyss/src/http.c

@@ -433,14 +433,15 @@ readRequestHeader(TSession * const sessionP,
 
     skipToNonemptyLine(sessionP->conn, deadline, &error);
 
-    if (!error)
+    if (!error) {
         readHeader(sessionP->conn, deadline, &endOfHeaders, &line, &error);
 
-    /* End of headers is delimited by an empty line, and we skipped all
-       the empty lines above, so we could not have encountered EOH:
-    */
-    assert(!endOfHeaders);
-
+        /* End of headers is delimited by an empty line, and we skipped all
+           the empty lines above, so readHeader() could not have encountered
+           EOH:
+        */
+        assert(!endOfHeaders);
+    }
     if (error)
         *httpErrorCodeP = 408;  /* Request Timeout */
     else {

lib/expat/xmlparse/Makefile

@@ -48,21 +48,17 @@ INCLUDES = \
 # LIBDEP is the shared libraries on which libxmlrpc_abyss depends.
 # The runtime loader should load these libraries when it loads libxmlrpc_abyss.
 
-LIBDEP = $(LIBXMLRPC_XMLTOK)
+LIBDEP = $(LIBXMLRPC_XMLTOK) $(LIBXMLRPC_UTIL)
 
 XMLPARSE_SHLIB = $(call shlibfn,libxmlrpc_xmlparse)
 #XMLPARSE_SHLIB is e.g. libxmlrpc_xmlparse.so.3.1
 XMLPARSE_SHLIBLE = $(call shliblefn,libxmlrpc_xmlparse)
 #XMLPARSE_SHLIBLE is e.g. libxmlrpc_xmlparse.so
 
-ifneq ($(SHARED_LIB_TYPE),NONE)
-  TARGET_SHARED_LIBS := $(XMLPARSE_SHLIB) $(XMLPARSE_SHLIBLE)
-  endif
-
 .PHONY: all
-all: libxmlrpc_xmlparse.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
+all: libxmlrpc_xmlparse.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS)
 
-# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
+# Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES:
 $(XMLPARSE_SHLIB): $(TARGET_MODS:%=%.osh) $(LIBDEP)
 $(XMLPARSE_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh) $(LIBDEP)
 

lib/expat/xmltok/Makefile

@@ -51,14 +51,10 @@ XMLTOK_SHLIB = $(call shlibfn,libxmlrpc_xmltok)
 XMLTOK_SHLIBLE = $(call shliblefn,libxmlrpc_xmltok)
 #XMLTOK_SHLIBLE is e.g. libxmlrpc_xmltok.so
 
-ifneq ($(SHARED_LIB_TYPE),NONE)
-  TARGET_SHARED_LIBS := $(XMLTOK_SHLIB) $(XMLTOK_SHLIBLE)
-  endif
-
 .PHONY: all
-all: libxmlrpc_xmltok.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
+all: libxmlrpc_xmltok.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS)
 
-# Rule for this is in common.mk, courtesy of TARGET_SHARED_LIBRARIES:
+# Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES
 $(XMLTOK_SHLIB): $(TARGET_MODS:%=%.osh)
 $(XMLTOK_SHLIB): LIBOBJECTS = $(TARGET_MODS:%=%.osh)
 

lib/libutil/Makefile

@@ -51,17 +51,13 @@ UTIL_SHLIB = $(call shlibfn,libxmlrpc_util)
 UTIL_SHLIBLE = $(call shliblefn,libxmlrpc_util)
 #UTIL_SHLIBLE is e.g. libxmlrpc_util.so
 
-ifneq ($(SHARED_LIB_TYPE),NONE)
-  TARGET_SHARED_LIBS := $(UTIL_SHLIB) $(UTIL_SHLIBLE)
-  endif
-
 # This 'common.mk' dependency makes sure the symlinks get built before
 # this make file is used for anything.
 
 $(SRCDIR)/common.mk: srcdir blddir
 
 .PHONY: all
-all: libxmlrpc_util.a $(TARGET_SHARED_LIBS) $(TARGET_SHARED_LE_LIBS)
+all: libxmlrpc_util.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS)
 
 # Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES:
 $(UTIL_SHLIB): $(TARGET_MODS:%=%.osh)

src/Makefile

@@ -69,8 +69,10 @@ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
   XML_PARSER_LIBDEP_DEP =
 else
   XMLRPC_XML_PARSER = xmlrpc_expat
-  XML_PARSER_LIBDEP = -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse
-  XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE)
+  XML_PARSER_LIBDEP = \
+    -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse \
+    -L$(BLDDIR)/lib/expat/xmltok -lxmlrpc_xmltok
+  XML_PARSER_LIBDEP_DEP = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
 endif
 
 # LIBxxx_OBJS is the list of object files that make up library libxxx.
@@ -163,7 +165,7 @@ $(LIBXMLRPC_SERVER): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc
+   -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
 
@@ -175,10 +177,9 @@ $(LIBXMLRPC_SERVER_ABYSS): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
   -L. -lxmlrpc_server \
   -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
-  -lxmlrpc
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_CGI = $(call shlibfn, libxmlrpc_server_cgi)
 
@@ -189,7 +190,8 @@ $(LIBXMLRPC_SERVER_CGI): \
   $(call shliblefn, libxmlrpc)
 $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_CGI): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc_server -lxmlrpc
+  -L. -lxmlrpc_server \
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
 
@@ -202,10 +204,8 @@ $(LIBXMLRPC_CLIENT): LIBOBJECTS = \
   $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \
   $(TRANSPORT_MODS:%=%.osh)
 $(LIBXMLRPC_CLIENT): LIBDEP = \
-  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
-  -L. -lxmlrpc \
-  $(TRANSPORT_LIBDEP)
-
+  $(TRANSPORT_LIBDEP) \
+  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 libxmlrpc.a: $(LIBXMLRPC_MODS:%=%.o)
 libxmlrpc.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o)

src/cpp/Makefile

@@ -49,6 +49,14 @@ else
   LIBXML_INCLUDES = -Isrcdir/lib/expat/xmlparse
 endif
 
+ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+  XML_PARSER_LIBDEP = $(shell xml2-config --libs)
+else
+  XML_PARSER_LIBDEP = \
+    -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse \
+    -L$(BLDDIR)/lib/expat/xmltok -lxmlrpc_xmltok
+endif
+
 LIBXMLRPCPP_MODS = \
   base64 env_wrap fault girerr girmem outcome param_list value xml
 LIBXMLRPC_SERVERPP_MODS = registry
@@ -115,15 +123,21 @@ LIBXMLRPC_CPP_SH = $(call shlibfn, libxmlrpc_cpp)
 $(LIBXMLRPC_CPP_SH): XmlRpcCpp.osh \
   $(LIBXMLRPC_UTIL)
 $(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh
-$(LIBXMLRPC_CPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -lxmlrpc_server -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+$(LIBXMLRPC_CPP_SH): LIBDEP = \
+  -Lblddir/src  -lxmlrpc_server -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPCPP_SH = $(call shlibfn, lib$(LIBXMLRPCPP_NAME))
 
 $(LIBXMLRPCPP_SH): $(LIBXMLRPCPP_MODS:%=%.osh) \
   $(LIBXMLRPC) \
   $(LIBXMLRPC_UTIL)
 $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
-$(LIBXMLRPCPP_SH): LIBDEP = -Lblddir/src -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+$(LIBXMLRPCPP_SH): LIBDEP = \
+  -Lblddir/src -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 
 LIBXMLRPC_SERVERPP_SH = $(call shlibfn, libxmlrpc_server++)
@@ -134,7 +148,11 @@ $(LIBXMLRPC_SERVERPP_SH): $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) \
   $(LIBXMLRPC_UTIL) \
   $(LIBXMLRPC)
 $(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh)
-$(LIBXMLRPC_SERVERPP_SH): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -l$(LIBXMLRPCPP_NAME)
+$(LIBXMLRPC_SERVERPP_SH): LIBDEP = \
+  -L. -l$(LIBXMLRPCPP_NAME) \
+  -Lblddir/src -lxmlrpc_server -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++)
 
@@ -143,17 +161,22 @@ $(LIBXMLRPC_SERVER_ABYSSPP_SH): $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) \
   $(LIBXMLRPC)
 $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \
-  -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc
-
-LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
+   -L. -lxmlrpc_server++  -l$(LIBXMLRPCPP_NAME) \
+   -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc \
+   $(XML_PARSER_LIBDEP) \
+   -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
+   -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
 
 $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \
   $(call shliblefn, libxmlrpc_server++) \
   $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
   $(LIBXMLRPC)
 $(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \
-  -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -Lblddir/src -lxmlrpc
+  -L. -lxmlrpc_server++  -l$(LIBXMLRPCPP_NAME) \
+  -Lblddir/src -lxmlrpc_server -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_SERVER_PSTREAMPP_SH = $(call shlibfn, libxmlrpc_server_pstream++)
 
@@ -164,7 +187,10 @@ $(LIBXMLRPC_SERVER_PSTREAMPP_SH): $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) \
   $(call shliblefn, libxmlrpc_server++)
 $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh)
 $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \
-  -Lblddir/src -lxmlrpc_server -L. -lxmlrpc_packetsocket -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME)
+  -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \
+  -Lblddir/src -lxmlrpc_server -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
 
 LIBXMLRPC_CLIENTPP_SH = $(call shlibfn, libxmlrpc_client++)
 
@@ -176,14 +202,21 @@ $(LIBXMLRPC_CLIENTPP_SH): $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) \
   $(LIBXMLRPC_CLIENT)
 $(LIBXMLRPC_CLIENTPP_SH): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh)
 $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \
-  -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket -Lblddir/src -lxmlrpc_client -lxmlrpc -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+  -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \
+  -Lblddir/src -lxmlrpc_client -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 LIBXMLRPC_PACKETSOCKET_SH = $(call shlibfn, libxmlrpc_packetsocket)
 
 $(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) \
   $(call shliblefn, lib$(LIBXMLRPCPP_NAME))
 $(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh)
-$(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = -L. -l$(LIBXMLRPCPP_NAME)
+$(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = \
+  -L. -l$(LIBXMLRPCPP_NAME) \
+  -Lblddir/src -lxmlrpc \
+  $(XML_PARSER_LIBDEP) \
+  -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
 
 libxmlrpc_cpp.a: XmlRpcCpp.o
 libxmlrpc_cpp.a: LIBOBJECTS = XmlRpcCpp.o

version.mk

@@ -8,4 +8,4 @@
 ###############################################################################
 XMLRPC_MAJOR_RELEASE = 1
 XMLRPC_MINOR_RELEASE = 17
-XMLRPC_POINT_RELEASE = 6
+XMLRPC_POINT_RELEASE = 7