head	1.13;
access;
symbols
	old_RELEASE_4_2_0:1.12
	old_RELEASE_4_1_1:1.12
	old_RELEASE_4_1_0:1.12
	old_RELEASE_3_5_0:1.12
	old_RELEASE_4_0_0:1.11
	old_RELEASE_3_4_0:1.11
	old_RELEASE_3_3_0:1.11
	old_RELEASE_3_2_0:1.10
	old_RELEASE_3_1_0:1.10
	old_RELEASE_2_2_8:1.9
	old_RELEASE_3_0_0:1.9
	old_RELEASE_2_2_7:1.9
	old_RELEASE_2_2_6:1.7
	old_RELEASE_2_2_2:1.3;
locks; strict;
comment	@# @;


1.13
date	2001.04.13.04.43.48;	author will;	state dead;
branches;
next	1.12;

1.12
date	2000.05.29.19.22.22;	author dirk;	state Exp;
branches;
next	1.11;

1.11
date	99.09.03.16.07.51;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	99.01.15.00.26.26;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	98.06.05.17.16.22;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	98.04.21.21.58.05;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	98.02.20.11.09.09;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	97.10.22.23.51.34;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	97.08.25.23.03.05;	author ache;	state dead;
branches;
next	1.4;

1.4
date	97.08.12.18.20.05;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	97.05.02.18.22.12;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	96.11.07.01.49.57;	author ache;	state dead;
branches;
next	1.1;

1.1
date	96.11.04.04.32.48;	author ache;	state Exp;
branches;
next	;


desc
@@


1.13
log
@Bring in Apache 2.0.16-beta.  Just in time for the release...

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
Repocopied by:	asami
@
text
@--- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
@@@@ -354,7 +354,22 @@@@
 # directory index.  Separate multiple entries with spaces.
 #
 <IfModule mod_dir.c>
-    DirectoryIndex index.html
+    <IfModule mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.php3 index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.php3 index.html
+        </IfModule>
+    </IfModule>
+    <IfModule !mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.html
+        </IfModule>
+    </IfModule>
 </IfModule>
 
 #
@@@@ -473,7 +488,7 @@@@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@@@ -486,7 +501,7 @@@@
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@@@ -708,13 +723,17 @@@@
     # For example, the PHP 3.x module (not part of the Apache distribution - see
     # http://www.php.net) will typically use:
     #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
+    <IfModule mod_php3.c>
+        AddType application/x-httpd-php3 .php3
+        AddType application/x-httpd-php3-source .php3s
+    </IfModule>
     #
     # And for PHP 4.x, use:
     #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
+    <IfModule mod_php4.c>
+        AddType application/x-httpd-php .php
+        AddType application/x-httpd-php-source .phps
+    </IfModule>
 
     AddType application/x-tar .tgz
 
@


1.12
log
@Add appropriate AddType and DirectoryIndex in preparation for
mod_php[34].

Approved by:	ache (maintainer)
@
text
@@


1.11
log
@upgrade to 1.3.9
@
text
@d1 27
a27 3
--- conf/httpd.conf-dist.orig	Thu May  6 00:17:59 1999
+++ conf/httpd.conf-dist	Fri Sep  3 15:42:56 1999
@@@@ -467,7 +467,7 @@@@
d36 1
a36 1
@@@@ -480,7 +480,7 @@@@
d45 22
@


1.10
log
@upgrade to 1.3.4
@
text
@d1 3
a3 12
--- conf/httpd.conf-dist.orig	Sat Dec 12 20:04:29 1998
+++ conf/httpd.conf-dist	Fri Jan 15 01:08:36 1999
@@@@ -241,7 +241,7 @@@@
 #  don't use Group #-1 on these systems!
 #
 User nobody
-Group #-1
+Group nogroup
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@@@ -459,7 +459,7 @@@@
d12 1
a12 1
@@@@ -472,7 +472,7 @@@@
@


1.9
log
@upgrade to 1.3b7
@
text
@d1 29
a29 53
*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
--- conf/httpd.conf-dist	Fri Jun  5 19:34:17 1998
***************
*** 50,56 ****
  #  don't use Group #-1 on these systems!
  
  User nobody
! Group #-1
  
  # ServerAdmin: Your address, where problems with the server should be
  # e-mailed.
--- 50,56 ----
  #  don't use Group #-1 on these systems!
  
  User nobody
! Group nogroup
  
  # ServerAdmin: Your address, where problems with the server should be
  # e-mailed.
***************
*** 94,100 ****
  # The location of the access logfile (Common Logfile Format).
  # If this does not start with /, ServerRoot is prepended to it.
  
! CustomLog logs/access_log common
  
  # If you would like to have an agent and referer logfile uncomment the
  # following directives.
--- 94,100 ----
  # The location of the access logfile (Common Logfile Format).
  # If this does not start with /, ServerRoot is prepended to it.
  
! #CustomLog logs/access_log common
  
  # If you would like to have an agent and referer logfile uncomment the
  # following directives.
***************
*** 105,111 ****
  # If you prefer a single logfile with access, agent and referer information
  # (Combined Logfile Format) you can use the following directive.
  
! #CustomLog logs/access_log combined
  
  # PidFile: The file the server should log its pid to
  PidFile logs/httpd.pid
--- 105,111 ----
  # If you prefer a single logfile with access, agent and referer information
  # (Combined Logfile Format) you can use the following directive.
  
! CustomLog logs/access_log combined
  
  # PidFile: The file the server should log its pid to
  PidFile logs/httpd.pid
@


1.8
log
@Upgrade to 1.3b6, now with loadable modules!
@
text
@d1 2
a2 2
*** conf/httpd.conf-dist.orig	Wed Apr  1 17:16:39 1998
--- conf/httpd.conf-dist	Tue Apr 21 23:43:19 1998
d4 2
a5 2
*** 42,48 ****
  #  suggested workaround is to create a user www and use that user.
d12 2
a13 2
--- 42,48 ----
  #  suggested workaround is to create a user www and use that user.
d21 1
a21 1
*** 86,92 ****
d29 1
a29 1
--- 86,92 ----
d38 1
a38 1
*** 97,103 ****
d46 1
a46 1
--- 97,103 ----
a53 17
***************
*** 106,112 ****
  # Not all architectures require this.  But if yours does (you'll know because
  # this file is created when you run Apache) then you *must* ensure that
  # no two invocations of Apache share the same scoreboard file.
! ScoreBoardFile logs/apache_runtime_status
  
  # The LockFile directive sets the path to the lockfile used when Apache
  # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
--- 106,112 ----
  # Not all architectures require this.  But if yours does (you'll know because
  # this file is created when you run Apache) then you *must* ensure that
  # no two invocations of Apache share the same scoreboard file.
! #ScoreBoardFile logs/apache_runtime_status
  
  # The LockFile directive sets the path to the lockfile used when Apache
  # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
@


1.7
log
@Upgrade to 1.3b5
@
text
@d1 2
a2 2
*** conf/httpd.conf-dist.orig	Wed Feb  4 22:42:29 1998
--- conf/httpd.conf-dist	Fri Feb 20 13:36:27 1998
d4 1
a4 1
*** 34,40 ****
d12 1
a12 1
--- 34,40 ----
d21 11
a31 11
*** 47,53 ****
  # mounted filesystem then please read the LockFile documentation,
  # you will save yourself a lot of trouble.
  
! ServerRoot @@@@ServerRoot@@@@
  
  # BindAddress: You can support virtual hosts with this option. This option
  # is used to tell the server which IP address to listen to. It can either
--- 47,53 ----
  # mounted filesystem then please read the LockFile documentation,
  # you will save yourself a lot of trouble.
d33 1
a33 1
! ServerRoot /usr/local/etc/apache
d35 2
a36 2
  # BindAddress: You can support virtual hosts with this option. This option
  # is used to tell the server which IP address to listen to. It can either
d38 3
a40 3
*** 59,79 ****
  # ErrorLog: The location of the error log file. If this does not start
  # with /, ServerRoot is prepended to it.
d42 1
a42 1
! ErrorLog logs/error_log
d44 5
a48 2
  # TransferLog: The location of the transfer log file. If this does not
  # start with /, ServerRoot is prepended to it.
d50 1
a50 1
! TransferLog logs/access_log
d53 3
a55 3
! PidFile logs/httpd.pid
  
  # ScoreBoardFile: File used to store internal server process information.
d59 1
a59 1
! ScoreBoardFile logs/apache_status
d63 1
a63 17
--- 59,81 ----
  # ErrorLog: The location of the error log file. If this does not start
  # with /, ServerRoot is prepended to it.
  
! ErrorLog /var/log/httpd-error.log
  
  # TransferLog: The location of the transfer log file. If this does not
  # start with /, ServerRoot is prepended to it.
  
! TransferLog /var/log/httpd-access.log
! 
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
  
  # PidFile: The file the server should log its pid to
! PidFile /var/run/httpd.pid
  
  # ScoreBoardFile: File used to store internal server process information.
d67 1
a67 1
! ScoreBoardFile /var/run/apache_runtime_status
a70 40
***************
*** 172,178 ****
  
  # To enable the cache as well, edit and uncomment the following lines:
  
! #CacheRoot @@@@ServerRoot@@@@/proxy
  #CacheSize 5
  #CacheGcInterval 4
  #CacheMaxExpire 24
--- 174,180 ----
  
  # To enable the cache as well, edit and uncomment the following lines:
  
! #CacheRoot /usr/local/etc/apache/proxy
  #CacheSize 5
  #CacheGcInterval 4
  #CacheMaxExpire 24
***************
*** 196,205 ****
   
  #<VirtualHost host.some_domain.com>
  #ServerAdmin webmaster@@host.some_domain.com
! #DocumentRoot /www/docs/host.some_domain.com
  #ServerName host.some_domain.com
! #ErrorLog logs/host.some_domain.com-error_log
! #TransferLog logs/host.some_domain.com-access_log
  #</VirtualHost>
  
  
--- 198,207 ----
   
  #<VirtualHost host.some_domain.com>
  #ServerAdmin webmaster@@host.some_domain.com
! #DocumentRoot /usr/local/www/host.some_domain.com/data
  #ServerName host.some_domain.com
! #ErrorLog /var/log/host.some_domain.com-error_log
! #TransferLog /var/log/host.some_domain.com-access_log
  #</VirtualHost>
  
  
@


1.6
log
@Upgrade to 1.3b2, now with support files and docs installed
@
text
@d1 2
a2 2
*** conf/httpd.conf-dist.orig	Thu Oct 16 22:55:54 1997
--- conf/httpd.conf-dist	Wed Oct 22 20:58:36 1997
d21 18
a38 1
*** 56,76 ****
d58 3
a60 3
  # ServerName allows you to set a host name which is sent back to clients for
  # your server if it's different than the one the program would get (i.e. use
--- 56,78 ----
d82 19
a100 2
  # ServerName allows you to set a host name which is sent back to clients for
  # your server if it's different than the one the program would get (i.e. use
d102 1
a102 1
*** 175,184 ****
d113 1
a113 1
--- 177,186 ----
@


1.5
log
@Do not replace Apache md5 with FreeBSD one, it cause
support problems and gains almost nothing
@
text
@d1 2
a2 2
*** src/util_md5.h.orig	Wed Jul 16 01:39:59 1997
--- src/util_md5.h	Thu Jul 24 05:09:25 1997
d4 84
a87 11
*** 50,56 ****
   *
   */
  
! #include "md5.h"
  
  API_EXPORT(char *) md5(pool *a, unsigned char *string);
  API_EXPORT(char *) md5contextTo64(pool *p, MD5_CTX *context);
--- 50,56 ----
   *
   */
a88 1
! #include <md5.h>
a89 2
  API_EXPORT(char *) md5(pool *a, unsigned char *string);
  API_EXPORT(char *) md5contextTo64(pool *p, MD5_CTX *context);
@


1.4
log
@Update the repository copied (with history) apache 1.2.1 to 1.3a1 from the
original apache-current port.
@
text
@@


1.3
log
@Upgrade to 1.2b10
@
text
@d1 2
a2 2
*** src/util_md5.h.bak	Wed Jan  1 21:10:46 1997
--- src/util_md5.h	Fri May  2 21:46:06 1997
d10 2
a11 2
  char *md5(pool *a, unsigned char *string);
  char *md5contextTo64(pool *p, MD5_CTX *context);
d18 2
a19 2
  char *md5(pool *a, unsigned char *string);
  char *md5contextTo64(pool *p, MD5_CTX *context);
@


1.2
log
@Conditionalize all my patches
@
text
@d1 2
a2 2
*** src/mod_dir.c.orig	Sat Jun 22 00:12:07 1996
--- src/mod_dir.c	Sun Nov  3 08:33:16 1996
d4 2
a5 23
*** 83,88 ****
--- 83,89 ----
  #define SUPPRESS_LAST_MOD 8
  #define SUPPRESS_SIZE 16
  #define SUPPRESS_DESC 32
+ #define SUPPRESS_HTML_PREAMBLE 64
  
  struct item {
      char *type;
***************
*** 205,210 ****
--- 206,213 ----
              opts |= SUPPRESS_SIZE;
          else if(!strcasecmp(w,"SuppressDescription"))
              opts |= SUPPRESS_DESC;
+ 	else if(!strcasecmp(w,"SuppressHTMLPreamble"))
+ 	    opts |= SUPPRESS_HTML_PREAMBLE;
          else if(!strcasecmp(w,"None"))
              opts = 0;
  	else
***************
*** 404,411 ****
   * Actually generating output
d8 1
d10 4
a13 6
! int insert_readme(char *name, char *readme_fname, int rule, request_rec *r) {
      char *fn;
      FILE *f;
      struct stat finfo;
--- 407,421 ----
   * Actually generating output
d16 1
a16 83
+ void put_html_preamble(char *title_name, request_rec *r)
+ {
+ 	rvputs(r, "<HEAD><TITLE>Index of ", title_name,
+ 	       "</TITLE></HEAD><BODY>\n", NULL);
+ }
  
! int insert_readme(char *name, char *readme_fname, int rule,
! 		  char *title_name, request_rec *r)
! {
      char *fn;
      FILE *f;
      struct stat finfo;
***************
*** 419,430 ****
          if(stat(fn,&finfo) == -1)
              return 0;
          plaintext=1;
-         if(rule) rputs("<HR>\n", r);
-         rputs("<PRE>\n", r);
      }
-     else if (rule) rputs("<HR>\n", r);
      if(!(f = pfopen(r->pool,fn,"r")))
          return 0;
      if (!plaintext)
  	send_fd(f, r);
      else
--- 429,442 ----
          if(stat(fn,&finfo) == -1)
              return 0;
          plaintext=1;
      }
      if(!(f = pfopen(r->pool,fn,"r")))
          return 0;
+     if(!rule && plaintext && title_name != NULL)
+ 	put_html_preamble(title_name, r);
+     if(rule) rputs("<HR>\n", r);
+     if(plaintext) rputs("<PRE>\n", r);
+ 
      if (!plaintext)
  	send_fd(f, r);
      else
***************
*** 714,724 ****
      while (title_endp > title_name && *title_endp == '/')
  	*title_endp-- = '\0';
      
!     rvputs(r, "<HEAD><TITLE>Index of ", title_name, "</TITLE></HEAD><BODY>\n",
! 	   NULL);
  
!     if((!(tmp = find_header(dir_conf,r))) || (!(insert_readme(name,tmp,0,r))))
          rvputs(r, "<H1>Index of ", title_name, "</H1>\n", NULL);
  
      /* 
       * Since we don't know how many dir. entries there are, put them into a 
--- 726,743 ----
      while (title_endp > title_name && *title_endp == '/')
  	*title_endp-- = '\0';
      
!     if(!(dir_opts & SUPPRESS_HTML_PREAMBLE))
! 	put_html_preamble(title_name, r);
  
!     if((!(tmp = find_header(dir_conf,r))) ||
!        (!(insert_readme(name, tmp, 0,
! 			((dir_opts & SUPPRESS_HTML_PREAMBLE) ?
! 			title_name : NULL), r))))
!     {
! 	if(dir_opts & SUPPRESS_HTML_PREAMBLE)
! 	    put_html_preamble(title_name, r);
          rvputs(r, "<H1>Index of ", title_name, "</H1>\n", NULL);
+     }
  
      /* 
       * Since we don't know how many dir. entries there are, put them into a 
***************
*** 751,757 ****
  
       if (dir_opts & FANCY_INDEXING)
           if((tmp = find_readme(dir_conf, r)))
!              insert_readme(name,tmp,1,r);
       else {
           rputs("</UL>", r);
       }
--- 770,776 ----
d18 2
a19 6
       if (dir_opts & FANCY_INDEXING)
           if((tmp = find_readme(dir_conf, r)))
! 	     insert_readme(name,tmp,1,NULL,r);
       else {
           rputs("</UL>", r);
       }
@


1.1
log
@Situation:
It is impossible to suppress initial HTML preamble for directories, i.e.
<HEAD><TITLE>Index of dir</TITLE></HEAD><BODY>
It means that it is impossible to change <TITLE> or add any
<META HTTP-EQUIV...> tags to <HEAD> section or change <BODY>
attributes without HTML syntax violation (.asis, cern_meta, etc.
not helps here too).

Fix:
I add "SuppressHTMLPreamble" option to "IndexOptions". When this option
is set _and_ HEADER.html (or what you set as it) is present and readable,
standard <HEAD><TITLE>Index of dir</TITLE></HEAD><BODY> preamble
will be suppressed assuming you have right HTML preamble in your
HEADER.html. It solves all problems mentioned above.
@
text
@@
