| OLD | NEW |
|---|
| 1 ServerRoot "/usr" | |
| 2 | |
| 3 LockFile "/tmp/WebKit/httpd.lock" | |
| 4 PidFile "/tmp/WebKit/httpd.pid" | |
| 5 ScoreBoardFile "/tmp/WebKit/httpd.scoreboard" | |
| 6 | |
| 7 Timeout 300 | 1 Timeout 300 |
| 8 KeepAlive On | 2 KeepAlive On |
| 9 MaxKeepAliveRequests 100 | 3 MaxKeepAliveRequests 100 |
| 10 KeepAliveTimeout 15 | 4 KeepAliveTimeout 15 |
| 11 | 5 |
| 12 MinSpareServers 1 | 6 LoadModule authz_host_module modules/mod_authz_host.so |
| 13 MaxSpareServers 5 | 7 LoadModule include_module modules/mod_include.so |
| 14 StartServers 1 | 8 LoadModule log_config_module modules/mod_log_config.so |
| 15 MaxClients 150 | 9 LoadModule headers_module modules/mod_headers.so |
| 16 MaxRequestsPerChild 100000 | 10 LoadModule ssl_module modules/mod_ssl.so |
| 17 | 11 LoadModule mime_module modules/mod_mime.so |
| 18 LoadModule authz_host_module libexec/apache2/mod_authz_host.so | 12 LoadModule asis_module modules/mod_asis.so |
| 19 LoadModule include_module libexec/apache2/mod_include.so | 13 LoadModule cgi_module modules/mod_cgi.so |
| 20 LoadModule log_config_module libexec/apache2/mod_log_config.so | 14 LoadModule negotiation_module modules/mod_negotiation.so |
| 21 LoadModule headers_module libexec/apache2/mod_headers.so | 15 LoadModule imagemap_module modules/mod_imagemap.so |
| 22 LoadModule ssl_module libexec/apache2/mod_ssl.so | 16 LoadModule actions_module modules/mod_actions.so |
| 23 LoadModule mime_module libexec/apache2/mod_mime.so | 17 LoadModule alias_module modules/mod_alias.so |
| 24 LoadModule asis_module libexec/apache2/mod_asis.so | 18 LoadModule rewrite_module modules/mod_rewrite.so |
| 25 LoadModule cgi_module libexec/apache2/mod_cgi.so | 19 LoadModule php5_module modules/php5apache2_2.dll |
| 26 LoadModule negotiation_module libexec/apache2/mod_negotiation.so | |
| 27 LoadModule imagemap_module libexec/apache2/mod_imagemap.so | |
| 28 LoadModule actions_module libexec/apache2/mod_actions.so | |
| 29 LoadModule alias_module libexec/apache2/mod_alias.so | |
| 30 LoadModule rewrite_module libexec/apache2/mod_rewrite.so | |
| 31 LoadModule php5_module libexec/apache2/libphp5.so | |
| 32 | 20 |
| 33 ServerName 127.0.0.1 | 21 ServerName 127.0.0.1 |
| 34 | 22 |
| 23 ScriptInterpreterSource Registry-Strict |
| 24 |
| 35 <Directory /> | 25 <Directory /> |
| 36 Options Indexes FollowSymLinks MultiViews ExecCGI Includes | 26 Options Indexes FollowSymLinks MultiViews ExecCGI Includes |
| 37 AllowOverride All | 27 AllowOverride All |
| 38 Order allow,deny | 28 Order allow,deny |
| 39 Allow from all | 29 Allow from all |
| 40 </Directory> | 30 </Directory> |
| 41 | 31 |
| 42 AccessFileName .htaccess | 32 AccessFileName .htaccess |
| 43 | 33 |
| 44 <Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])"> | 34 <Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])"> |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 Order allow,deny | 137 Order allow,deny |
| 148 Deny from all | 138 Deny from all |
| 149 Satisfy All | 139 Satisfy All |
| 150 </Files> | 140 </Files> |
| 151 | 141 |
| 152 <Directory ~ ".*\.\.namedfork"> | 142 <Directory ~ ".*\.\.namedfork"> |
| 153 Order allow,deny | 143 Order allow,deny |
| 154 Deny from all | 144 Deny from all |
| 155 Satisfy All | 145 Satisfy All |
| 156 </Directory> | 146 </Directory> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 155173003:
checkpoint unix version of apache win32 patch. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk