Attachment 170694 Details for Bug 209743 – Hopefully in plain text format

Hopefully in plain text format

httpd.conf.diff (text/plain), 16.79 KB, created by Ron Wingfield on 2016-05-26 17:25:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ron Wingfield

Created: 2016-05-26 17:25:07 UTC

Size: 16.79 KB

patch

obsolete

>51c51,52
>< Listen 192.168.1.74:80
>---
>> #Listen 12.34.56.78:80
>> Listen 80
>66,69c67,68
>< LoadModule authn_dbm_module libexec/apache24/mod_authn_dbm.so
>< LoadModule authn_anon_module libexec/apache24/mod_authn_anon.so
>< #LoadModule authn_default_module libexec/apache22/mod_authn_default.so
>< #LoadModule authn_alias_module libexec/apache22/mod_authn_alias.so
>---
>> #LoadModule authn_dbm_module libexec/apache24/mod_authn_dbm.so
>> #LoadModule authn_anon_module libexec/apache24/mod_authn_anon.so
>76,78c75,76
>< LoadModule authz_dbm_module libexec/apache24/mod_authz_dbm.so
>< LoadModule authz_owner_module libexec/apache24/mod_authz_owner.so
>< #LoadModule authz_default_module libexec/apache22/mod_authz_default.so
>---
>> #LoadModule authz_dbm_module libexec/apache24/mod_authz_dbm.so
>> #LoadModule authz_owner_module libexec/apache24/mod_authz_owner.so
>85c83
>< LoadModule auth_digest_module libexec/apache24/mod_auth_digest.so
>---
>> #LoadModule auth_digest_module libexec/apache24/mod_auth_digest.so
>87,91c85,89
>< LoadModule file_cache_module libexec/apache24/mod_file_cache.so
>< LoadModule cache_module libexec/apache24/mod_cache.so
>< LoadModule cache_disk_module libexec/apache24/mod_cache_disk.so
>< LoadModule cache_socache_module libexec/apache24/mod_cache_socache.so
>< LoadModule socache_shmcb_module libexec/apache24/mod_socache_shmcb.so
>---
>> #LoadModule file_cache_module libexec/apache24/mod_file_cache.so
>> #LoadModule cache_module libexec/apache24/mod_cache.so
>> #LoadModule cache_disk_module libexec/apache24/mod_cache_disk.so
>> #LoadModule cache_socache_module libexec/apache24/mod_cache_socache.so
>> #LoadModule socache_shmcb_module libexec/apache24/mod_socache_shmcb.so
>94d91
>< #LoadModule watchdog_module libexec/apache24/mod_watchdog.so
>97c94
>< LoadModule dumpio_module libexec/apache24/mod_dumpio.so
>---
>> #LoadModule dumpio_module libexec/apache24/mod_dumpio.so
>104c101
>< LoadModule include_module libexec/apache24/mod_include.so
>---
>> #LoadModule include_module libexec/apache24/mod_include.so
>109,110c106,108
>< LoadModule charset_lite_module libexec/apache24/mod_charset_lite.so
>< LoadModule deflate_module libexec/apache24/mod_deflate.so
>---
>> #LoadModule charset_lite_module libexec/apache24/mod_charset_lite.so
>> #LoadModule deflate_module libexec/apache24/mod_deflate.so
>> #LoadModule proxy_html_module libexec/apache24/mod_proxy_html.so
>115c113
>< LoadModule logio_module libexec/apache24/mod_logio.so
>---
>> #LoadModule logio_module libexec/apache24/mod_logio.so
>117,119c115,117
>< LoadModule mime_magic_module libexec/apache24/mod_mime_magic.so
>< LoadModule cern_meta_module libexec/apache24/mod_cern_meta.so
>< LoadModule expires_module libexec/apache24/mod_expires.so
>---
>> #LoadModule mime_magic_module libexec/apache24/mod_mime_magic.so
>> #LoadModule cern_meta_module libexec/apache24/mod_cern_meta.so
>> #LoadModule expires_module libexec/apache24/mod_expires.so
>121,122c119,120
>< LoadModule usertrack_module libexec/apache24/mod_usertrack.so
>< LoadModule unique_id_module libexec/apache24/mod_unique_id.so
>---
>> #LoadModule usertrack_module libexec/apache24/mod_usertrack.so
>> #LoadModule unique_id_module libexec/apache24/mod_unique_id.so
>143c141
>< LoadModule ssl_module libexec/apache24/mod_ssl.so
>---
>> #LoadModule ssl_module libexec/apache24/mod_ssl.so
>148d145
>< #LoadModule lbmethod_heartbeat_module libexec/apache24/mod_lbmethod_heartbeat.so
>153,156c150
>< #LoadModule heartbeat_module libexec/apache24/mod_heartbeat.so
>< #LoadModule heartmonitor_module libexec/apache24/mod_heartmonitor.so
>< LoadModule dav_module libexec/apache24/mod_dav.so
>< #  rtw  LoadModule status_module libexec/apache24/mod_status.so
>---
>> #LoadModule dav_module libexec/apache24/mod_dav.so
>158,162c152,153
>< LoadModule asis_module libexec/apache24/mod_asis.so
>< LoadModule info_module libexec/apache24/mod_info.so
>< #LoadModule suexec_module libexec/apache22/mod_suexec.so
>< 
>< # Need attention here!  rtw
>---
>> #LoadModule asis_module libexec/apache24/mod_asis.so
>> #LoadModule info_module libexec/apache24/mod_info.so
>164c155
>< 	LoadModule cgid_module libexec/apache24/mod_cgid.so
>---
>> 	#LoadModule cgid_module libexec/apache24/mod_cgid.so
>167c158
>< 	LoadModule cgi_module libexec/apache24/mod_cgi.so
>---
>> 	#LoadModule cgi_module libexec/apache24/mod_cgi.so
>169,170c160
>< 
>< LoadModule dav_fs_module libexec/apache24/mod_dav_fs.so
>---
>> #LoadModule dav_fs_module libexec/apache24/mod_dav_fs.so
>172,173c162,163
>< LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so
>< LoadModule negotiation_module libexec/apache24/mod_negotiation.so
>---
>> #LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so
>> #LoadModule negotiation_module libexec/apache24/mod_negotiation.so
>175,178c165,168
>< LoadModule imagemap_module libexec/apache24/mod_imagemap.so
>< LoadModule actions_module libexec/apache24/mod_actions.so
>< LoadModule speling_module libexec/apache24/mod_speling.so
>< LoadModule userdir_module libexec/apache24/mod_userdir.so
>---
>> #LoadModule imagemap_module libexec/apache24/mod_imagemap.so
>> #LoadModule actions_module libexec/apache24/mod_actions.so
>> #LoadModule speling_module libexec/apache24/mod_speling.so
>> #LoadModule userdir_module libexec/apache24/mod_userdir.so
>180,195c170
>< LoadModule rewrite_module libexec/apache24/mod_rewrite.so
>< 
>< #AddType  application/x-httpd-php         .php
>< #AddType  application/x-httpd-php-source  .phps
>< 
>< <FilesMatch "\.php$">
><     SetHandler application/x-httpd-php
>< </FilesMatch>
>< 
>< <FilesMatch "\.phps$">
><     SetHandler application/x-httpd-php-source
>< </FilesMatch>
>< 
>< #   SetHandler application/x-httpd-php
>< #   SetHandler application/x-httpd-php-source
>< 
>---
>> #LoadModule rewrite_module libexec/apache24/mod_rewrite.so
>231c206
>< ServerAdmin rtwingfield@Archaxis.net
>---
>> ServerAdmin you@example.com
>240,243c215
>< ServerName bravo.archaxis.net
>< #ServerName archaxis.net
>< #ServerName 66.138.104.73   ...old IP address ...moot  ...rtw
>< #ServerName 162.202.233.81  ...new U-verse address 
>---
>> #ServerName www.example.com:80
>245c217
>< # ==================================================================
>---
>> #
>253a226
>> 
>259c232
>< # ==================================================================
>---
>> #
>266,279c239
>< #DocumentRoot "/usr/local/www/apache24/data"
>< DocumentRoot "/www/vhosts"
>< 
>< # This should correspont to what DocumentRoot is set to.
>< # ...per rtw from v22 conf.
>< <Directory "/www/vhosts">
><     Options Includes Indexes FollowSymLinks ExecCGI
><     AllowOverride All
><     Require all granted
><     AddHandler type-map var
><     DirectoryIndex index.html index.html.var index.php
>< </Directory>
>< 
>< 
>---
>> DocumentRoot "/usr/local/www/apache24/data"
>293a254
>> 
>299a261
>> 
>306,335d267
>< <Directory />
><     Require all denied
><         deny from       1e100.net
><         deny from       amazonaws.com
><         deny from       dsnextgen.com
><         deny from       www.top--sites.com
><         deny from       www.top--sites.com
><         deny from       www.top--sites.net
><         deny from       www.89.25.110.151
><         deny from       www.61.142.176.73
><         deny from       www.212.91.184.14
><         deny from       124.47.56.204
><         deny from       120.197.230.238
><     Require all granted
><     #   allow from all
>< </Directory>
>< 
>< 
>< #*****************************************************************
>< # Installed awstats-7.3,1       ...by rtw
>< # Please add the following to your apache config, and restart.
>< 
>< #
>< # Directives to allow use of AWStats as a CGI
>< #
>< Alias /awstatsclasses "/usr/local/www/awstats/classes/"
>< Alias /awstatscss "/usr/local/www/awstats/css/"
>< Alias /awstatsicons "/usr/local/www/awstats/icons/"
>< ScriptAlias /awstats/ "/usr/local/www/awstats/cgi-bin/"
>< 
>337,347d268
>< # This is to permit URL access to scripts/files in AWStats directory.
>< #
>< <Directory "/usr/local/www/awstats/">
><     Options None
><     AllowOverride None
><     Order allow,deny
><     Allow from all
>< </Directory>
>< 
>< #*****************************************************************
>< 
>350c271
>< 
>---
>> #
>354a276
>> #
>357c279
>< 
>---
>> #
>362,368c284
>< # From v22 config   . . .rtw
>< <FilesMatch "^\.ht">
><     Order allow,deny
><     Deny from all
><     Satisfy All
>< </FilesMatch>
>< 
>---
>> #
>373a290,291
>> #
>> ErrorLog "/var/log/httpd-error.log"
>375,376c293
>< ErrorLog "/var/log/httpd/httpd-error.log"
>< 
>---
>> #
>380,383c297,298
>< 
>< LogLevel alert rewrite:trace8
>< LogLevel error
>< 
>---
>> #
>> LogLevel warn
>405c320
><     #CustomLog "/var/log/httpd-access.log" common
>---
>>     CustomLog "/var/log/httpd-access.log" common
>411c326
><     CustomLog "/var/log/httpd/httpd-access.log" combined
>---
>>     #CustomLog "/var/log/httpd-access.log" combined
>441,563c356
><       ScriptAlias /cgi-bin/ "/usr/local/www/apache24/cgi-bin/"
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     alias /zen-cart/ "/usr/local/www/zen-cart/"
><     <Directory "/usr/local/www/zen-cart/">
><         Options +Includes -Indexes
><         AllowOverride all
>< 	Require all granted
><     #   Order Deny,Allow . . .test/rtw
><     #   Allow from all
><     #   Options +FollowSymlinks
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /zenphoto/ "/usr/local/www/zenphoto-1.4.12/"
><     <Directory "/usr/local/www/zenphoto-1.4.12/">
>< #   <Directory "/usr/local/www/zenphoto.bu.2016/">
><         Options +Includes -Indexes
><         AllowOverride all
>< 	Require all granted
><     #   Order Deny,Allow
><     #   Allow from all
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /WebCalendar-1.2.3/ "/usr/local/www/WebCalendar-1.2.3/"
><     <Directory "/usr/local/www/WebCalendar-1.2.3/">
><         Options +Includes +Indexes
><         AllowOverride all
><         Order Deny,Allow
><         Allow from all
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /phpmyadmin/ "/usr/local/www/phpMyAdmin/"
><     <Directory "/usr/local/www/phpMyAdmin/">
><         Options +Includes +Indexes
><         AllowOverride all
>< 	Require all granted
><     #   Order Deny,Allow
><     #   Allow from all
><     #   Allow from 127.0.0.1 .Archaxis.net
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
><     Alias /awstats-docs/ "/usr/local/share/doc/awstats/"
><     <Directory "/usr/local/share/doc/awstats">
><         Options +Includes +Indexes
><         AllowOverride all
><         Order Deny,Allow
><         Allow from all
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.html
><     </Directory>
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /smf-forums/ "/usr/local/www/smf-2.0.10/"
><     <Directory "/usr/local/www/smf-2.0.10/">
><         Options +Includes -Indexes
><         AllowOverride all
>< 	Require all granted
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /phpldapadmin/ "/usr/local/www/phpldapadmin/htdocs/"
><     <Directory "/usr/local/www/phpldapadmin/htdocs">
><         Options none
><         AllowOverride none
><         Order Deny,Allow
><         Deny from all
><         Allow from 192.168.1 .archaxis.net
><         Allow from 127.0.0.1 .archaxis.net
><         DirectoryIndex index.php
><     </Directory>
>< 
>< 
><     Alias /shared_files/ "/usr/local/www/share/"
><     <Directory "/usr/local/www/share/">
><         Options +Indexes
><         AllowOverride all
><     #   Order Allow,Deny
><         Allow from all
><         RewriteEngine On
><         RewriteOptions Inherit
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
><     Alias /joomla "/usr/local/www/joomla3/"
><     AcceptPathInfo On
><     <Directory "/usr/local/www/joomla3/">
><         Options +Indexes
><         AllowOverride None
><         Order Allow,Deny
><         Allow from all
><         RewriteEngine On
><         RewriteOptions Inherit
><         DirectoryIndex index.php
><     </Directory>
>< 
>< #++++++++++++++++++++++++++++++++++++++++++++++++++
>< 
>---
>>     ScriptAlias /cgi-bin/ "/usr/local/www/apache24/cgi-bin/"
>572c365
><      Scriptsock /var/run/cgisock
>---
>>     #Scriptsock cgisock
>575,583c368,373
>< #<Directory "/usr/local/www/apache24/cgi-bin">
>< #   AllowOverride None
>< #   Options None
>< #   Require all granted
>< #</Directory>
>< 
>< # The following from v22 conf   ...rtw
>< <Directory "/www/cgi-bin">
><     AllowOverride Options
>---
>> #
>> # "/usr/local/www/apache24/cgi-bin" should be changed to whatever your ScriptAliased
>> # CGI directory exists, if you have that configured.
>> #
>> <Directory "/usr/local/www/apache24/cgi-bin">
>>     AllowOverride None
>585,587c375
><     Require all denied
>< #   Order allow,deny   ...rtw test out; don't understand at this point.
>< #   Allow from all	...apparently still works???
>---
>>     Require all granted
>590,599d377
>< # DefaultType: the default MIME type the server will use for a document
>< # if it cannot otherwise determine one, such as from filename extensions.
>< # If your server contains mostly text or HTML documents, "text/plain" is
>< # a good value.  If most of your content is binary, such as applications
>< # or images, you may want to use "application/octet-stream" instead to
>< # keep browsers from trying to display binary files as though they are
>< # text.
>< 
>< # DefaultType text/plain  . . .deprecated!     rtw
>< 
>611,613c389
><     AddType application/x-httpd-php .php
><     AddType application/x-httpd-php-source .phps
><     AddType application/x-gzip .tgz
>---
>>     #AddType application/x-gzip .tgz
>618,619c394,395
><     AddEncoding x-compress .Z
><     AddEncoding x-gzip .gz .tgz
>---
>>     #AddEncoding x-compress .Z
>>     #AddEncoding x-gzip .gz .tgz
>625a402
>> 
>635,643d411
><     AddHandler cgi-script pl cgi
><     # To use server-parsed HTML files
><     # March 9, 2009 by RTW
>< 
><     XBitHack ON
><     <FilesMatch "\.html(\..+)?$">
><      SetOutputFilter INCLUDES
><     </FilesMatch>
>< 
>646c414
><     AddHandler type-map var
>---
>>     #AddHandler type-map var
>654,655c422,423
><     AddType text/html .shtml
><     AddOutputFilter INCLUDES .shtml
>---
>>     #AddType text/html .shtml
>>     #AddOutputFilter INCLUDES .shtml
>663c431
>< MIMEMagicFile etc/apache24/magic
>---
>> #MIMEMagicFile etc/apache24/magic
>674,690d441
><     ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
><     ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
><     ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
><     ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
><     ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
><     ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
><     ErrorDocument 410 /error/HTTP_GONE.html.var
><     ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
><     ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
><     ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
><     ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
><     ErrorDocument 415 /error/HTTP_SERVICE_UNAVAILABLE.html.var
><     ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
><     ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
><     ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
><     ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
><     ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
>720c471
>< Include etc/apache24/extra/httpd-mpm.conf
>---
>> #Include etc/apache24/extra/httpd-mpm.conf
>726c477
>< Include etc/apache24/extra/httpd-autoindex.conf
>---
>> #Include etc/apache24/extra/httpd-autoindex.conf
>729c480
>< Include etc/apache24/extra/httpd-languages.conf
>---
>> #Include etc/apache24/extra/httpd-languages.conf
>733d483
>< UserDir disabled # this from previous v2.0 httpd.conf
>736c486
>< Include etc/apache24/extra/httpd-info.conf
>---
>> #Include etc/apache24/extra/httpd-info.conf
>739c489
>< Include etc/apache24/extra/httpd-vhosts.conf
>---
>> #Include etc/apache24/extra/httpd-vhosts.conf
>742c492
>< #Include etc/apache24/extra/httpd-manual.conf . . .maybe later!
>---
>> #Include etc/apache24/extra/httpd-manual.conf
>745c495
>< Include etc/apache24/extra/httpd-dav.conf
>---
>> #Include etc/apache24/extra/httpd-dav.conf
>748c498
>< Include etc/apache24/extra/httpd-default.conf
>---
>> #Include etc/apache24/extra/httpd-default.conf
>756c506
>< Include etc/apache24/extra/httpd-ssl.conf
>---
>> #Include etc/apache24/extra/httpd-ssl.conf
>766,776d515
>< #
>< # uncomment out the below to deal with user agents that deliberately
>< # violate open standards by misusing DNT (DNT *must* be a specific
>< # end-user choice)
>< #
>< #<IfModule setenvif_module>
>< #BrowserMatch "MSIE 10.0;" bad_DNT
>< #</IfModule>
>< #<IfModule headers_module>
>< #RequestHeader unset DNT env=bad_DNT
>< #</IfModule>

Actions: View

Attachments on bug 209743: 170664 | 170673 | 170686 | 170693 | 170694 | 170802