You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2011/05/18 05:07:48 UTC

svn commit: r1104673 - in /httpd/httpd/branches/2.2.x: STATUS os/win32/os.h

Author: wrowe
Date: Wed May 18 03:07:48 2011
New Revision: 1104673

URL: http://svn.apache.org/viewvc?rev=1104673&view=rev
Log:
Correct Win64 Servername Identification

PR: 47418
Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
Backports: r1104624

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/os/win32/os.h

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1104673&r1=1104672&r2=1104673&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed May 18 03:07:48 2011
@@ -104,11 +104,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trawick: any reason it shouldn't be completely aligned with default_handler's
              choice to return OK vs. 500?
 
-  * Correct Win64 Servername Identification
-    PR: 47418
-    Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
-    http://svn.apache.org/viewvc?view=revision&revision=1104624
-    +1: wrowe, trawick, fuankg
 
 PATCHES/ISSUES THAT ARE STALLED
 

Modified: httpd/httpd/branches/2.2.x/os/win32/os.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/os/win32/os.h?rev=1104673&r1=1104672&r2=1104673&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/win32/os.h (original)
+++ httpd/httpd/branches/2.2.x/os/win32/os.h Wed May 18 03:07:48 2011
@@ -38,7 +38,11 @@
 #include <io.h>
 #include <fcntl.h>
 
+#ifdef _WIN64
+#define PLATFORM "Win64"
+#else
 #define PLATFORM "Win32"
+#endif
 
 /* going away shortly... */
 #define HAVE_DRIVE_LETTERS