[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dbates at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit b67574eb12764441ac383434d2b63165b301e97f
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 19:22:06 2011 +0000

    2011-02-01  Scott Cameron  <sccameron at rim.com>
    
            Reviewed by Daniel Bates.
    
            Use Windows format for MinGW HTTPD path.
            https://bugs.webkit.org/show_bug.cgi?id=53503
    
            * Scripts/webkitperl/httpd.pm:
              - Use single-quotes around MySys value for $httpdPath in getHTTPDPath()
                so that we don't have to escape the space characters in the path. Also,
                changed path to Windows-style path and removed FIXME comment.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c11f611..547caf7 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Scott Cameron  <sccameron at rim.com>
+
+        Reviewed by Daniel Bates.
+
+        Use Windows format for MinGW HTTPD path.
+        https://bugs.webkit.org/show_bug.cgi?id=53503
+
+        * Scripts/webkitperl/httpd.pm:
+          - Use single-quotes around MySys value for $httpdPath in getHTTPDPath()
+            so that we don't have to escape the space characters in the path. Also,
+            changed path to Windows-style path and removed FIXME comment.
+
 2011-02-01  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Tools/Scripts/webkitperl/httpd.pm b/Tools/Scripts/webkitperl/httpd.pm
index e0552fb..b73904d 100644
--- a/Tools/Scripts/webkitperl/httpd.pm
+++ b/Tools/Scripts/webkitperl/httpd.pm
@@ -79,9 +79,7 @@ sub getHTTPDPath
     if (isDebianBased()) {
         $httpdPath = "/usr/sbin/apache2";
     } elsif (isMsys()) {
-        # FIXME: We should write this without escaping the space character. Instead, the call
-        #        site should take responsibility for escaping the path.
-        $httpdPath = "/c/program\ files/apache\ software\ foundation/apache2.2/bin/httpd.exe";
+        $httpdPath = 'c:\program files\apache software foundation\apache2.2\bin\httpd.exe';
     } else {
         $httpdPath = "/usr/sbin/httpd";
     }

-- 
WebKit Debian packaging