Changeset 154736 in webkit


Ignore:
Timestamp:
Aug 28, 2013 5:39:48 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

Http tests fails on Debian with Apache 2.4
https://bugs.webkit.org/show_bug.cgi?id=120352

Reviewed by Andreas Kling.

Tools:

Select httpd.conf file for debian based on version, matching Fedora behavior.

  • Scripts/webkitpy/port/base.py:

(Port._apache_config_file_name_for_platform):

LayoutTests:

Added an apache 2.4 configuration file adapted from Fedora's,
and renamed the 2.2 file to have consistent naming.

  • http/conf/debian-httpd-2.2.conf: Renamed from LayoutTests/http/conf/apache2-debian-httpd.conf.
  • http/conf/debian-httpd-2.4.conf: Added.
Location:
trunk
Files:
1 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r154731 r154736  
     12013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        Http tests fails on Debian with Apache 2.4
     4        https://bugs.webkit.org/show_bug.cgi?id=120352
     5
     6        Reviewed by Andreas Kling.
     7
     8        Added an apache 2.4 configuration file adapted from Fedora's,
     9        and renamed the 2.2 file to have consistent naming.
     10
     11        * http/conf/debian-httpd-2.2.conf: Renamed from LayoutTests/http/conf/apache2-debian-httpd.conf.
     12        * http/conf/debian-httpd-2.4.conf: Added.
     13
    1142013-08-28  Sergio Villar Senin  <svillar@igalia.com>
    215
  • trunk/Tools/ChangeLog

    r154735 r154736  
     12013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        Http tests fails on Debian with Apache 2.4
     4        https://bugs.webkit.org/show_bug.cgi?id=120352
     5
     6        Reviewed by Andreas Kling.
     7
     8        Select httpd.conf file for debian based on version, matching Fedora behavior.
     9
     10        * Scripts/webkitpy/port/base.py:
     11        (Port._apache_config_file_name_for_platform):
     12
    1132013-08-28  Commit Queue  <commit-queue@webkit.org>
    214
  • trunk/Tools/Scripts/webkitpy/port/base.py

    r153439 r154736  
    12231223                return 'fedora-httpd-' + self._apache_version() + '.conf'
    12241224            if self._is_debian_based():
    1225                 return 'apache2-debian-httpd.conf'
     1225                return 'debian-httpd-' + self._apache_version() + '.conf'
    12261226            if self._is_arch_based():
    12271227                return 'archlinux-httpd.conf'
Note: See TracChangeset for help on using the changeset viewer.