Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CAFFF18EFB for ; Mon, 8 Feb 2016 23:22:01 +0000 (UTC) Received: (qmail 86407 invoked by uid 500); 8 Feb 2016 23:22:01 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 86342 invoked by uid 500); 8 Feb 2016 23:22:01 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 86333 invoked by uid 99); 8 Feb 2016 23:22:01 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2016 23:22:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4277FC00EC for ; Mon, 8 Feb 2016 23:22:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.371 X-Spam-Level: * X-Spam-Status: No, score=1.371 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.429] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id vi4UultR_rcg for ; Mon, 8 Feb 2016 23:21:59 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 33176439BF for ; Mon, 8 Feb 2016 23:21:59 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id B9FA0E00AF for ; Mon, 8 Feb 2016 23:21:58 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BAACA3A0667 for ; Mon, 8 Feb 2016 23:21:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160208232158.BAACA3A0667@svn01-us-west.apache.org> 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 #