Title: [204907] trunk/LayoutTests
Revision
204907
Author
[email protected]
Date
2016-08-24 11:33:25 -0700 (Wed, 24 Aug 2016)

Log Message

[Win] http server is not starting.
https://bugs.webkit.org/show_bug.cgi?id=161134

Reviewed by Alexey Proskuryakov.

Avoid setting the php ini folder twice, it is not allowed by xampp.

* http/conf/apache2.4-httpd-win.conf:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (204906 => 204907)


--- trunk/LayoutTests/ChangeLog	2016-08-24 18:12:36 UTC (rev 204906)
+++ trunk/LayoutTests/ChangeLog	2016-08-24 18:33:25 UTC (rev 204907)
@@ -1,3 +1,14 @@
+2016-08-24  Per Arne Vollan  <[email protected]>
+
+        [Win] http server is not starting.
+        https://bugs.webkit.org/show_bug.cgi?id=161134
+
+        Reviewed by Alexey Proskuryakov.
+
+        Avoid setting the php ini folder twice, it is not allowed by xampp.
+
+        * http/conf/apache2.4-httpd-win.conf:
+
 2016-08-24  Nan Wang  <[email protected]>
 
         AX: Add test for line text marker range on iOS

Modified: trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf (204906 => 204907)


--- trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf	2016-08-24 18:12:36 UTC (rev 204906)
+++ trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf	2016-08-24 18:33:25 UTC (rev 204907)
@@ -126,8 +126,6 @@
 </IfModule>
 
 <IfModule mod_php5.c>
-    PHPIniDir "C:/xampp/php"
-
     AddType application/x-httpd-php .php
     AddType application/x-httpd-php .bat
     AddType application/x-httpd-php-source .phps
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to