| Index: tools/python/google/httpd_config/httpd2_mac.conf
|
| ===================================================================
|
| --- tools/python/google/httpd_config/httpd2_mac.conf (revision 13844)
|
| +++ tools/python/google/httpd_config/httpd2_mac.conf (working copy)
|
| @@ -6,12 +6,6 @@
|
| # directive.
|
| #
|
| Listen 127.0.0.1:8000
|
| -Listen 127.0.0.1:8080
|
| -Listen 127.0.0.1:8081
|
| -Listen 127.0.0.1:8443
|
| -Listen 127.0.0.1:9000
|
| -Listen 127.0.0.1:9080
|
| -Listen 127.0.0.1:9443
|
|
|
| #
|
| # Dynamic Shared Object (DSO) Support
|
| @@ -27,73 +21,28 @@
|
| # Note: The order in which modules are loaded is important. Don't change
|
| # the order below without expert advice.
|
| #
|
| -#LoadModule authn_file_module lib/apache2/mod_authn_file.so
|
| -#LoadModule authn_dbm_module lib/apache2/mod_authn_dbm.so
|
| -#LoadModule authn_anon_module lib/apache2/mod_authn_anon.so
|
| -#LoadModule authn_dbd_module lib/apache2/mod_authn_dbd.so
|
| -#LoadModule authn_default_module lib/apache2/mod_authn_default.so
|
| -LoadModule authz_host_module lib/apache2/mod_authz_host.so
|
| -#LoadModule authz_groupfile_module lib/apache2/mod_authz_groupfile.so
|
| -#LoadModule authz_user_module lib/apache2/mod_authz_user.so
|
| -#LoadModule authz_dbm_module lib/apache2/mod_authz_dbm.so
|
| -#LoadModule authz_owner_module lib/apache2/mod_authz_owner.so
|
| -#LoadModule authz_default_module lib/apache2/mod_authz_default.so
|
| -#LoadModule auth_basic_module lib/apache2/mod_auth_basic.so
|
| -#LoadModule auth_digest_module lib/apache2/mod_auth_digest.so
|
| -#LoadModule dbd_module lib/apache2/mod_dbd.so
|
| -#LoadModule dumpio_module lib/apache2/mod_dumpio.so
|
| -#LoadModule ext_filter_module lib/apache2/mod_ext_filter.so
|
| -LoadModule include_module lib/apache2/mod_include.so
|
| -#LoadModule filter_module lib/apache2/mod_filter.so
|
| -#LoadModule deflate_module lib/apache2/mod_deflate.so
|
| -LoadModule log_config_module lib/apache2/mod_log_config.so
|
| -#LoadModule log_forensic_module lib/apache2/mod_log_forensic.so
|
| -#LoadModule logio_module lib/apache2/mod_logio.so
|
| -#LoadModule env_module lib/apache2/mod_env.so
|
| -#LoadModule mime_magic_module lib/apache2/mod_mime_magic.so
|
| -#LoadModule cern_meta_module lib/apache2/mod_cern_meta.so
|
| -#LoadModule expires_module lib/apache2/mod_expires.so
|
| -LoadModule headers_module lib/apache2/mod_headers.so
|
| -#LoadModule ident_module lib/apache2/mod_ident.so
|
| -#LoadModule usertrack_module lib/apache2/mod_usertrack.so
|
| -#LoadModule unique_id_module lib/apache2/mod_unique_id.so
|
| -#LoadModule setenvif_module lib/apache2/mod_setenvif.so
|
| -#LoadModule version_module lib/apache2/mod_version.so
|
| -#LoadModule proxy_module lib/apache2/mod_proxy.so
|
| -#LoadModule proxy_connect_module lib/apache2/mod_proxy_connect.so
|
| -#LoadModule proxy_ftp_module lib/apache2/mod_proxy_ftp.so
|
| -#LoadModule proxy_http_module lib/apache2/mod_proxy_http.so
|
| -#LoadModule proxy_ajp_module lib/apache2/mod_proxy_ajp.so
|
| -#LoadModule proxy_balancer_module lib/apache2/mod_proxy_balancer.so
|
| -LoadModule ssl_module lib/apache2/mod_ssl.so
|
| -LoadModule mime_module lib/apache2/mod_mime.so
|
| -#LoadModule dav_module lib/apache2/mod_dav.so
|
| -#LoadModule status_module lib/apache2/mod_status.so
|
| -LoadModule autoindex_module lib/apache2/mod_autoindex.so
|
| -LoadModule asis_module lib/apache2/mod_asis.so
|
| -#LoadModule info_module lib/apache2/mod_info.so
|
| -LoadModule cgi_module lib/apache2/mod_cgi.so
|
| -#LoadModule dav_fs_module lib/apache2/mod_dav_fs.so
|
| -#LoadModule vhost_alias_module lib/apache2/mod_vhost_alias.so
|
| -LoadModule negotiation_module lib/apache2/mod_negotiation.so
|
| -#LoadModule dir_module lib/apache2/mod_dir.so
|
| -LoadModule imagemap_module lib/apache2/mod_imagemap.so
|
| -LoadModule actions_module lib/apache2/mod_actions.so
|
| -#LoadModule speling_module lib/apache2/mod_speling.so
|
| -#LoadModule userdir_module lib/apache2/mod_userdir.so
|
| -LoadModule alias_module lib/apache2/mod_alias.so
|
| -LoadModule rewrite_module lib/apache2/mod_rewrite.so
|
| -LoadModule php5_module lib/apache2/cygphp5.so
|
| +# NOTE: This is not the same set of modules that gets loaded on win.
|
| +LoadModule authz_host_module libexec/apache2/mod_authz_host.so
|
| +LoadModule mime_module libexec/apache2/mod_mime.so
|
| +LoadModule ssl_module libexec/apache2/mod_ssl.so
|
| +LoadModule autoindex_module libexec/apache2/mod_autoindex.so
|
| +LoadModule alias_module libexec/apache2/mod_alias.so
|
| +LoadModule log_config_module libexec/apache2/mod_log_config.so
|
|
|
| -#LoadModule imap_module lib/apache/mod_imap.dll
|
| -#LoadModule access_module lib/apache/mod_access.dll
|
| -#LoadModule auth_module lib/apache/mod_auth.dll
|
| +#LoadModule include_module libexec/apache2/mod_include.so
|
| +#LoadModule headers_module libexec/apache2/mod_headers.so
|
| +#LoadModule asis_module libexec/apache2/mod_asis.so
|
| +#LoadModule cgi_module libexec/apache2/mod_cgi.so
|
| +#LoadModule negotiation_module libexec/apache2/mod_negotiation.so
|
| +#LoadModule imagemap_module libexec/apache2/mod_imagemap.so
|
| +#LoadModule actions_module libexec/apache2/mod_actions.so
|
| +#LoadModule rewrite_module libexec/apache2/mod_rewrite.so
|
|
|
|
|
| #
|
| # Each directory to which Apache has access, can be configured with respect
|
| # to which services and features are allowed and/or disabled in that
|
| -# directory (and its subdirectories).
|
| +# directory (and its subdirectories).
|
| #
|
| <Directory />
|
| Options Indexes FollowSymLinks MultiViews ExecCGI Includes
|
| @@ -105,7 +54,7 @@
|
|
|
| #
|
| # Apple specific filesystem protection.
|
| -#
|
| +
|
| <Files "rsrc">
|
| Order allow,deny
|
| Deny from all
|
|
|