Binary files on cygwin must be opened in binary mode in the

default handler or they will be corrupted, just as with the
other \r\n platforms.

PR:  9185
Reviewed by:  William Rowe

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

diff --git a/src/CHANGES b/src/CHANGES
index f42ad8dc882c40729020995ac189cfe4014fed4e..95e6a45351416274c705dae9a6bb7e7b87b5dcc6 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.25
 
+  *) Fixed sending of binary files under Cygwin.  PR 9185.
+     [Cliff Woolley]
+
   *) Added Cygwin directory layout to config.layout file.
      [Stipe Tolj, <tolj@wapme-systems.de>]
 

diff --git a/src/main/http_core.c b/src/main/http_core.c
index d37b04bd83bae03e4e9f870174b640fa5962d643..b0339d8eb10edc7d34f6d5b8740cb0634f8d5dc1 100644 (file)
--- a/src/main/http_core.c
+++ b/src/main/http_core.c
@@ -3834,7 +3834,7 @@ static int default_handler(request_rec *r)
         return METHOD_NOT_ALLOWED;
     }
        
-#if defined(OS2) || defined(WIN32) || defined(NETWARE)
+#if defined(OS2) || defined(WIN32) || defined(NETWARE) || defined(CYGWIN)
     /* Need binary mode for OS/2 */
     f = ap_pfopen(r->pool, r->filename, "rb");
 #else