PR:

Obtained from:
Submitted by:	Stipe Tolj <tolj@wapme-systems.de>
Reviewed by:

Some Cygwin portability changes, from
    Message-ID: <3BAB4213.74AA3C0F@wapme-systems.de>
Did not include the below patch to install.sh since this looked like
it would affect other OSs...

	 #  Check if we need to add an executable extension (such as ".exe")
	-#  on specific OS to src and dst
	+#  on specific OS to src and dst.
	+#  At least Cygwin requires this to ensure a clean "make install".
	 if [ -f "$src.exe" ]; then
	-  if [ -f "$src" ]; then
	-    : # Cygwin [ test ] is too stupid to do [ -f "$src.exe" ] && [ ! -f "$src" ]
	-  else
	     ext=".exe"
	-  fi
	 fi
	 src="$src$ext"
	 dst="$dst$ext"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91124 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 55739373481bf83e6b66aae395c970abdefd4e0a..e7bf38f72f12eaac8b6d5710c23be6f6e42aba35 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 1.3.21
 
+  *) PORT: Some Cygwin changes. [Stipe Tolj <tolj@wapme-systems.de>]
+
   *) ErrorDocument 404 pointing to a parsed html file with a
      <!--#include virtual="file" --> with a request URI containing
      %2f would result in a segfault (NULL pointer deref, not a

diff --git a/src/Configure b/src/Configure
index 5ed3e2960b8d4987dc6f689c96d289d9bf456c0d..f5d2a12ac272afa527a078318da31f200c8d067f 100755 (executable)
--- a/src/Configure
+++ b/src/Configure
@@ -1394,7 +1394,7 @@ if [ "x$using_shlib" = "x1" ] ; then
            SHLIB_SUFFIX_DEPTH=0
            DLL_IMPORT_LIB='lib$(TARGET).a'
            DLL_IMPORT_DEF='lib$(TARGET).def'
-           LD_SHLIB='dllwrap --export-all --output-def $(DLL_IMPORT_DEF) --implib $(DLL_IMPORT_LIB) --driver-name $(CC)'
+           LD_SHLIB='dllwrap --export-all --implib $(DLL_IMPORT_LIB) --driver-name $(CC)'
            LD_SHCORE_LIBS='$(LIBS)'
            LIBS_SHLIB='$(EXTRA_LIBS)'
            SHARED_CORE_EP=''

diff --git a/src/include/ap_config.h b/src/include/ap_config.h
index a848b2fd76a9324e5b9b28a179d7333b10d00b50..ad4a0920719e2f615ffae640b18db40f487153c1 100644 (file)
--- a/src/include/ap_config.h
+++ b/src/include/ap_config.h
@@ -976,6 +976,8 @@ typedef int rlim_t;
 #define USE_MMAP_SCOREBOARD
 #define USE_MMAP_FILES
 #define HAVE_SYSLOG 1
+#define HAVE_FCNTL_SERIALIZED_ACCEPT
+#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
 
 
 #else