httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1729290 - in /httpd/httpd/trunk/modules/proxy: NWGNUmakefile NWGNUproxy NWGNUproxyajp NWGNUproxybalancer NWGNUproxyexpress NWGNUproxyfcgi NWGNUproxyftp NWGNUproxyhcheck NWGNUproxyhtp NWGNUproxyscgi NWGNUserf
Date Mon, 08 Feb 2016 23:21:58 GMT
Author: rjung
Date: Mon Feb  8 23:21:57 2016
New Revision: 1729290

URL: http://svn.apache.org/viewvc?rev=1729290&view=rev
Log:
Revert r1728874:
Netware: pull up ws2nlm imports from all (most)
proxy module makefiles to the main proxy makefile.

The individual module Makefiles overwrite
FILES_nlm_Ximports instead of appending.
Furthermore, now we know which modules need
this import so we can set it specifically
for those.

Modified:
    httpd/httpd/trunk/modules/proxy/NWGNUmakefile
    httpd/httpd/trunk/modules/proxy/NWGNUproxy
    httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
    httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
    httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
    httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
    httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
    httpd/httpd/trunk/modules/proxy/NWGNUproxyhcheck
    httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
    httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
    httpd/httpd/trunk/modules/proxy/NWGNUserf

Modified: httpd/httpd/trunk/modules/proxy/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUmakefile?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUmakefile Mon Feb  8 23:21:57 2016
@@ -228,12 +228,6 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Mon Feb  8 23:21:57 2016
@@ -210,6 +210,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Mon Feb  8 23:21:57 2016
@@ -213,6 +213,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Mon Feb  8 23:21:57 2016
@@ -209,6 +209,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress Mon Feb  8 23:21:57 2016
@@ -208,6 +208,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi Mon Feb  8 23:21:57 2016
@@ -210,6 +210,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Mon Feb  8 23:21:57 2016
@@ -209,6 +209,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhcheck
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyhcheck?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhcheck (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhcheck Mon Feb  8 23:21:57 2016
@@ -209,6 +209,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Mon Feb  8 23:21:57 2016
@@ -209,6 +209,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi Mon Feb  8 23:21:57 2016
@@ -209,6 +209,12 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #

Modified: httpd/httpd/trunk/modules/proxy/NWGNUserf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUserf?rev=1729290&r1=1729289&r2=1729290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUserf (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUserf Mon Feb  8 23:21:57 2016
@@ -296,6 +296,12 @@ FILES_nlm_Ximports = \
 	GetSuperHighResolutionTimer \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #



Mime
View raw message