date:19980201

cvs commit: apache-1.3 STATUS

1998-02-01 Thread martin

martin  98/01/31 16:21:14

  Modified:.STATUS
  Log:
  One vote, and a change Jan'98 -> Feb'98 (Here in Europe, it's Feb already)
  
  Revision  ChangesPath
  1.139 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -u -r1.138 -r1.139
  --- STATUS1998/01/30 19:30:30 1.138
  +++ STATUS1998/02/01 00:21:13 1.139
  @@ -4,7 +4,7 @@
   
   2.0  : In pre-alpha development
see: 
  -1.3b4: In development, maybe a release late Jan 98? Jim will be RM
  +1.3b4: In development, maybe a release early Feb 98? Jim will be RM
unless someone else wants it
   1.3b3: Released and announced
   1.3b1: There is no 1.3b1
  @@ -238,7 +238,7 @@
 voting through cvs, by creating a directory under the source tree
 and putting them there?  Please vote.
<[EMAIL PROTECTED]>
  - Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0
  + Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0, Martin +1
   
   * Paul would like to see a 'gdbm' option because he uses
 it a lot. Dean notes that 'gdbm' include 'db' support

cvs commit: apache-2.0 STATUS

1998-02-01 Thread fielding

fielding98/01/31 18:11:46

  Added:   .STATUS
  Log:
  A new beginning.
  
  Revision  ChangesPath
  1.1  apache-2.0/STATUS
  
  Index: STATUS
  ===
  Apache 2.0 STATUS:
  
  Release:
  
  2.0  : In pre-alpha development
see: 
  
  Plan:
  
  Everyone with plans on things they want to do for 2.0
  should add them to the repository now.  Use a descriptive
  filename.
  
  Other code will be copied over when 1.3.0 is finished.
  
  Showstoppers:
  Committed Code Changes:
  Available Patches:
  In progress:
  Needs patch:
  
  Open issues:
  Closed issues:

cvs commit: apache-1.2/src http_protocol.c

1998-02-01 Thread dgaudet

dgaudet 98/01/31 18:22:30

  Modified:src  http_protocol.c
  Log:
  The last commit contained changes it shouldn't have.  Reverse them.
  
  Revision  ChangesPath
  1.129 +31 -112   apache-1.2/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/http_protocol.c,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- http_protocol.c   1998/01/30 09:55:41 1.128
  +++ http_protocol.c   1998/02/01 02:22:28 1.129
  @@ -548,15 +548,13 @@
   }
   }
   
  -const char *check_fulluri (request_rec *r, const char *uri)
  -{
  +const char *check_fulluri (request_rec *r, const char *uri) {
 char *name, *host;
 int i;
 unsigned port;
  -  server_addr_rec * sar;
   
 /* This routine parses full URLs, if they match the server */
  -  if (strncasecmp(uri, "http://";, 7)) return uri;
  +  if (strncmp(uri, "http://";, 7)) return uri;
 name = pstrdup(r->pool, uri + 7);
 
 /* Find the hostname, assuming a valid request */
  @@ -569,13 +567,7 @@
 else port = 80;
   
 /* Make sure ports patch */
  -  if (port != r->server->port) {
  -for (sar = r->server->addrs; sar; sar = sar->next) {
  -  if( (sar->host_port == 0) || (port == sar->host_port) )
  -break;
  -}
  -if (!sar) return uri;
  -  }
  +  if (port != r->server->port) return uri;
   
 /* Save it for later use */
 r->hostname = pstrdup(r->pool, host);
  @@ -686,29 +678,15 @@
   }
   }
   
  -#define ADDR_MATCHES(addr1,addr2) \
  -   (addr1.s_addr == addr2.s_addr) || (addr1.s_addr == htonl(INADDR_ANY)) \
  -|| (addr1.s_addr == DEFAULT_VHOST_ADDR)
  -
  -static void check_hostalias (request_rec *r)
  -{
  +static void check_hostalias (request_rec *r) {
 const char *hostname=r->hostname;
 char *host = getword(r->pool, &hostname, ':'); /* Get rid of port */
 unsigned port = (*hostname) ? atoi(hostname) : 80;
  -  server_rec *s = r->server;
  -  server_addr_rec * sar;
  +  server_rec *s;
 int l;
   
  -/* make sure the client can't spoof the port;
  - * have to check all possiblities to see if the server
  - * should be listening. */
  -  if (port != r->server->port) {
  -for (sar = s->addrs; sar; sar = sar->next) {
  -  if ( (port == sar->host_port) || (sar->host_port == 0) )
  -break;
  -}
  -if (!sar) return;
  -  }
  +  if (port && (port != r->server->port))
  +return;
   
 l = strlen(host)-1;
 if ((host[l]) == '.') {
  @@ -726,68 +704,37 @@
configuration */
continue;
   }
  -/* ok, now there are several possibilities, and we're matching the
  - * hostname, the port, and r->connection->local_addr.  The last is
  - * required so as to only respond on an address to which this vhost
  - * should actually be listening.
  - *
  - * Either we can match s->server_name and s->port while matching
  - * against the ip address in a record in the s->addrs list *or* we
  - * can match s->server_name and a complete record in the s->addrs
  - * list *or* we can match the virtual host name and the address and
  - * the port of a record in the s->addrs list.
  - */
  -if (!strcasecmp(host,s->server_hostname)) {   /* ServerName matches 
hostname */
  -  if (port == s->port) {  /* possibly configured by Port 
*/
  -for (sar = s->addrs; sar; sar = sar->next) {
  -  if 
(ADDR_MATCHES(sar->host_addr,r->connection->local_addr.sin_addr))
  -break; /* SN matches, Port matches, and one IP addr matches */
  -}
  -  } else { /* check to see if an addr 
matches */
  -for (sar = s->addrs; sar; sar = sar->next) {
  -  if (((port == sar->host_port) || (sar->host_port == 0))
  -  && (ADDR_MATCHES(sar->host_addr,
  -   r->connection->local_addr.sin_addr)))
  -break; /* SN matches, and a addr matches IP & port */
  -}
  -  }
  -  if (sar) { /* we got a match */
  -r->server = r->connection->server = s;
  -if (r->hostlen && !strncasecmp(r->uri, "http://";, 7)) {
  -  r->uri += r->hostlen;
  -  parse_uri(r, r->uri);
  -  /* we still might want to do something below (ie. set r->proxyreq) 
*/
  -}
  +
  +if ((!strcasecmp(host, s->server_hostname)) && (port == s->port)) {
  +  r->server = r->connection->server = s;
  +  if (r->hostlen && !strncmp(r->uri, "http://";, 7)) {
  + r->uri += r->hostlen;
  + parse_uri(r, r->uri);
 }
  -} /* ServerName doesn't match */
  +}
   
  -/* now s->addrs list, include the names, from the VirtualHost directive 
*/
  -for (sar = s->addrs; sar; sar = sar->next) {
  -  if (((sar->host_port==0) || (port==sar->host_port))
  -  && 
(ADDR_MATCHES(sar->host_addr,r->connection->local_ad

cvs commit: apache-1.2/src CHANGES http_core.c mod_asis.c mod_dir.c mod_include.c mod_info.c

1998-02-01 Thread dgaudet

dgaudet 98/01/31 18:33:42

  Modified:src  CHANGES http_core.c mod_asis.c mod_dir.c
mod_include.c mod_info.c
  Log:
  set r->allowed properly
  
  Revision  ChangesPath
  1.289 +3 -0  apache-1.2/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
  retrieving revision 1.288
  retrieving revision 1.289
  diff -u -r1.288 -r1.289
  --- CHANGES   1998/01/30 14:45:45 1.288
  +++ CHANGES   1998/02/01 02:33:36 1.289
  @@ -1,5 +1,8 @@
   Changes with Apache 1.2.6
   
  +  *) Set r->allowed properly in mod_asis.c, mod_dir.c, mod_info.c,
  + and mod_include.c.  [Dean Gaudet]
  +
 *) Variable 'cwd' was being used pointlessly before being set.
[Ken Coar] PR#1738
   
  
  
  
  1.83  +1 -2  apache-1.2/src/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/http_core.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- http_core.c   1998/01/30 09:13:55 1.82
  +++ http_core.c   1998/02/01 02:33:36 1.83
  @@ -1332,8 +1332,7 @@
   if ((errstatus = discard_request_body(r)) != OK)
   return errstatus;
   
  -r->allowed |= (1 << M_GET);
  -r->allowed |= (1 << M_OPTIONS);
  +r->allowed |= (1 << M_GET) | (1 << M_OPTIONS);
   
   if (r->method_number == M_INVALID) {
log_printf(r->server, "Invalid method in request %s", r->the_request);
  
  
  
  1.14  +1 -0  apache-1.2/src/mod_asis.c
  
  Index: mod_asis.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_asis.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_asis.c1997/04/06 07:43:40 1.13
  +++ mod_asis.c1998/02/01 02:33:37 1.14
  @@ -63,6 +63,7 @@
   FILE *f;
   char *location;
   
  +r->allowed |= (1 << M_GET);
   if (r->method_number != M_GET) return DECLINED;
   if (r->finfo.st_mode == 0) {
log_reason("File does not exist", r->filename, r);
  
  
  
  1.28  +1 -0  apache-1.2/src/mod_dir.c
  
  Index: mod_dir.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_dir.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_dir.c 1998/01/30 09:14:04 1.27
  +++ mod_dir.c 1998/02/01 02:33:38 1.28
  @@ -872,6 +872,7 @@
   if (error_notfound)
return error_notfound;
   
  +r->allowed |= (1 << M_GET);
   if (r->method_number != M_GET) return NOT_IMPLEMENTED;
   
   /* OK, nothing easy.  Trot out the heavy artillery... */
  
  
  
  1.35  +1 -0  apache-1.2/src/mod_include.c
  
  Index: mod_include.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_include.c 1998/01/30 09:14:05 1.34
  +++ mod_include.c 1998/02/01 02:33:38 1.35
  @@ -2204,6 +2204,7 @@
   if (!(allow_options(r) & OPT_INCLUDES)) {
   return DECLINED;
   }
  +r->allowed |= (1 << M_GET);
   if (r->method_number != M_GET) {
   return DECLINED;
   }
  
  
  
  1.18  +5 -1  apache-1.2/src/mod_info.c
  
  Index: mod_info.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_info.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_info.c1998/01/30 09:14:06 1.17
  +++ mod_info.c1998/02/01 02:33:39 1.18
  @@ -282,11 +282,15 @@
extern char server_root[MAX_STRING_LEN];
extern char server_confname[MAX_STRING_LEN];
   
  + r->allowed |= (1 << M_GET);
  + if (r->method_number != M_GET)
  + return DECLINED;
  +
r->content_type = "text/html";  
send_http_header(r);
if(r->header_only) {
return 0;
  -}
  + }
hard_timeout("send server info", r);

rputs("Server Information\n",r);

cvs commit: apache-1.2/src/modules/proxy mod_proxy.c

1998-02-01 Thread dgaudet

dgaudet 98/01/31 18:47:46

  Modified:src  CHANGES http_config.c http_protocol.c mod_cgi.c
mod_dir.c mod_rewrite.c util.c
   src/modules/proxy mod_proxy.c
  Log:
  be sensitive to the case!
  
  Revision  ChangesPath
  1.290 +3 -0  apache-1.2/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
  retrieving revision 1.289
  retrieving revision 1.290
  diff -u -r1.289 -r1.290
  --- CHANGES   1998/02/01 02:33:36 1.289
  +++ CHANGES   1998/02/01 02:47:37 1.290
  @@ -1,5 +1,8 @@
   Changes with Apache 1.2.6
   
  +  *) Fixed some case-sensitivity issues according to RFC2068.
  + [Dean Gaudet]
  +
 *) Set r->allowed properly in mod_asis.c, mod_dir.c, mod_info.c,
and mod_include.c.  [Dean Gaudet]
   
  
  
  
  1.51  +1 -1  apache-1.2/src/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/http_config.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- http_config.c 1998/01/30 09:13:53 1.50
  +++ http_config.c 1998/02/01 02:47:38 1.51
  @@ -883,7 +883,7 @@
   if (strcmp(w, "*") == 0) {
my_addr = htonl(INADDR_ANY);
is_an_ip_addr = 1;
  -} else if( strcmp(w, "_default_") == 0
  +} else if( strcasecmp(w, "_default_") == 0
|| strcmp(w, "255.255.255.255") == 0 ) {
my_addr = DEFAULT_VHOST_ADDR;
is_an_ip_addr = 1;
  
  
  
  1.130 +1 -1  apache-1.2/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/http_protocol.c,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- http_protocol.c   1998/02/01 02:22:28 1.129
  +++ http_protocol.c   1998/02/01 02:47:39 1.130
  @@ -129,7 +129,7 @@
   if (!(range = table_get(r->headers_in, "Range")))
 range = table_get(r->headers_in, "Request-Range");
   
  -if (!range || strncmp(range, "bytes=", 6)) {
  +if (!range || strncasecmp(range, "bytes=", 6)) {
table_set (r->headers_out, "Accept-Ranges", "bytes");
return 0;
   }
  
  
  
  1.41  +1 -1  apache-1.2/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_cgi.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_cgi.c 1998/01/30 09:14:03 1.40
  +++ mod_cgi.c 1998/02/01 02:47:40 1.41
  @@ -84,7 +84,7 @@
   int is_scriptaliased (request_rec *r)
   {
   char *t = table_get (r->notes, "alias-forced-type");
  -return t && (!strcmp (t, "cgi-script"));
  +return t && (!strcasecmp (t, "cgi-script"));
   }
   
   /* Configuration stuff */
  
  
  
  1.29  +1 -1  apache-1.2/src/mod_dir.c
  
  Index: mod_dir.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_dir.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_dir.c 1998/02/01 02:33:38 1.28
  +++ mod_dir.c 1998/02/01 02:47:40 1.29
  @@ -481,7 +481,7 @@
   if (r->status != HTTP_OK) {
return NULL;
   }
  -if (r->content_type && !strcmp(r->content_type,"text/html") && 
!r->content_encoding) {
  +if (r->content_type && !strcasecmp(r->content_type,"text/html") && 
!r->content_encoding) {
   if(!(thefile = pfopen(r->pool, r->filename,"r")))
   return NULL;
   n = fread(titlebuf,sizeof(char),MAX_STRING_LEN - 1,thefile);
  
  
  
  1.30  +19 -19apache-1.2/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===
  RCS file: /export/home/cvs/apache-1.2/src/mod_rewrite.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_rewrite.c 1998/01/30 09:14:08 1.29
  +++ mod_rewrite.c 1998/02/01 02:47:41 1.30
  @@ -947,13 +947,13 @@
   return OK; 
   }
   else if (  (strlen(r->filename) > 7 &&
  -strncmp(r->filename, "http://";, 7) == 0)
  +strncasecmp(r->filename, "http://";, 7) == 0)
   || (strlen(r->filename) > 8 &&
  -strncmp(r->filename, "https://";, 8) == 0)
  +strncasecmp(r->filename, "https://";, 8) == 0)
   || (strlen(r->filename) > 9 &&
  -strncmp(r->filename, "gopher://";, 9) == 0)
  +strncasecmp(r->filename, "gopher://";, 9) == 0)
   || (strlen(r->filename) > 6 &&
  -strncmp(r->filename, "ftp://";, 6) == 0)) {
  +

cvs commit: apache-1.3/src/main http_vhost.c

1998-02-01 Thread dgaudet

dgaudet 98/01/31 20:54:48

  Modified:src  CHANGES
   src/main http_vhost.c
  Log:
  Fix a bug I introduced with http_vhost.c... r->hostname is supposed to
  always have :port removed from it.
  
  Revision  ChangesPath
  1.609 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.608
  retrieving revision 1.609
  diff -u -r1.608 -r1.609
  --- CHANGES   1998/01/31 00:24:29 1.608
  +++ CHANGES   1998/02/01 04:54:45 1.609
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b4
   
  +  *) Fix a bug where r->hostname didn't have the :port stripped
  + from it.  [Dean Gaudet]
  +
 *) Tweaked the headers_out table size, and the subprocess_env
table size guess in rename_original_environment().  Added
MAKE_TABLE_PROFILE which can help discover make_table()
  
  
  
  1.5   +23 -11apache-1.3/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_vhost.c  1998/01/28 11:33:22 1.4
  +++ http_vhost.c  1998/02/01 04:54:47 1.5
  @@ -587,6 +587,24 @@
* run-time vhost matching functions
*/
   
  +/* Remove :port and optionally a single trailing . from the hostname, this
  + * canonicalizes it somewhat.
  + */
  +static void fix_hostname(request_rec *r)
  +{
  +const char *hostname = r->hostname;
  +char *host = getword(r->pool, &hostname, ':');   /* get rid of port */
  +size_t l;
  +
  +/* trim a trailing . */
  +l = strlen(host);
  +if (l > 0 && host[l-1] == '.') {
  +host[l-1] = '\0';
  +}
  +
  +r->hostname = host;
  +}
  +
   static void check_hostalias(request_rec *r)
   {
   /*
  @@ -602,21 +620,12 @@
* - except for the addresses from the VirtualHost line, none of the 
other
*   names we'll match have ports associated with them
*/
  -const char *hostname = r->hostname;
  -char *host = getword(r->pool, &hostname, ':');  /* Get rid of port */
  +const char *host = r->hostname;
   unsigned port = ntohs(r->connection->local_addr.sin_port);
   server_rec *s;
   server_rec *last_s;
  -size_t l;
   name_chain *src;
   
  -/* trim a trailing . */
  -l = strlen(host);
  -if (l > 0 && host[l-1] == '.') {
  -host[l-1] = '\0';
  -}
  -
  -r->hostname = host;
   last_s = NULL;
   
   /* Recall that the name_chain is a list of server_addr_recs, some of
  @@ -730,14 +739,17 @@
   {
   /* check if we tucked away a name_chain */
   if (r->connection->vhost_lookup_data) {
  -if (r->hostname || (r->hostname = table_get(r->headers_in, "Host")))
  +if (r->hostname || (r->hostname = table_get(r->headers_in, "Host"))) 
{
  + fix_hostname(r);
   check_hostalias(r);
  + }
   else
   check_serverpath(r);
   }
   else if (!r->hostname) {
   /* must set this for HTTP/1.1 support */
   r->hostname = table_get(r->headers_in, "Host");
  + fix_hostname(r);
   }
   }

cvs commit: apache-1.3/src/ap Makefile.tmpl

1998-02-01 Thread coar

coar98/02/01 07:56:21

  Modified:src  Configure Makefile.tmpl
   src/os/bs2000 Makefile.tmpl
   src/os/emx Makefile.tmpl
   src/os/unix Makefile.tmpl
   src/main Makefile.tmpl
   src/ap   Makefile.tmpl
  Log:
Phase 2 of moving the .h files into src/include.. modify the scripts
and Makefiles that reference them.
  
  Revision  ChangesPath
  1.179 +4 -3  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -u -r1.178 -r1.179
  --- Configure 1998/01/21 23:59:54 1.178
  +++ Configure 1998/02/01 15:56:14 1.179
  @@ -873,7 +873,7 @@
   if [ "$RULE_WANTHSREGEX" = "yes" ]; then
   REGLIB="regex/libregex.a"
   SUBDIRS="$SUBDIRS regex"
  -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
  +#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
   fi
   
   # create modules.c
  @@ -991,7 +991,8 @@
   echo "CFLAGS1=$CFLAGS">> Makefile.config
   echo "INCLUDES1=$INCLUDES">> Makefile.config
   
  -INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
  +#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
  +INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR include"
   incprefix="-I"
   for depth in 0 1 2; do
   incvar="INCLUDES_DEPTH${depth}="
  @@ -1071,7 +1072,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   EOF
if [ -f $moddir/Makefile.libdir ]; then
# it's responsible for the rest of its Makefile
  
  
  
  1.74  +2 -2  apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- Makefile.tmpl 1997/11/30 19:17:23 1.73
  +++ Makefile.tmpl 1998/02/01 15:56:14 1.74
  @@ -69,5 +69,5 @@
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \
  - main/http_config.h
  +modules.o: modules.c include/httpd.h include/conf.h include/alloc.h \
  + include/buff.h include/http_config.h
  
  
  
  1.2   +1 -1  apache-1.3/src/os/bs2000/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1998/01/13 23:11:30 1.1
  +++ Makefile.tmpl 1998/02/01 15:56:16 1.2
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=   os.o os-inline.o ebcdic.o
   
  
  
  
  1.2   +1 -1  apache-1.3/src/os/emx/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl 1997/11/05 12:48:22 1.1
  +++ Makefile.tmpl 1998/02/01 15:56:17 1.2
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=os.o os-inline.o
   COPY=os.h os-inline.c
  
  
  
  1.10  +1 -1  apache-1.3/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.tmpl 1997/10/07 19:53:32 1.9
  +++ Makefile.tmpl 1998/02/01 15:56:18 1.10
  @@ -2,7 +2,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
   LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
  -INCDIR=../../main
  +INCDIR=../../include
   
   OBJS=os.o os-inline.o
   
  
  
  
  1.8   +163 -106  apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl 1997/12/24 04:36:13 1.7
  +++ Makefile.tmpl 1998/02/01 15:56:20 1.8
  @@ -7,9 +7,10 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  +INCDIR=../include

cvs commit: apache-1.3/src/regex Makefile.tmpl

1998-02-01 Thread coar

coar98/02/01 08:33:13

  Modified:src  CHANGES Configure
   src/regex Makefile.tmpl
  Log:
Final phase of the move of .h files to src/include.
  
  Revision  ChangesPath
  1.610 +10 -0 apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.609
  retrieving revision 1.610
  diff -u -r1.609 -r1.610
  --- CHANGES   1998/02/01 04:54:45 1.609
  +++ CHANGES   1998/02/01 16:33:08 1.610
  @@ -1,5 +1,15 @@
   Changes with Apache 1.3b4
   
  +  *) Yet another rearrangement of the source tree.. now all the common
  + header files are in the src/include directory.  The -Imain -Iap
  + references in Makefiles have been changed to the simpler -Iinclude
  + instead.  In addition to simplifying the build a little bit, this
  + also makes it clear when a module is referencing something in a
  + other than kosher manner (e.g., the proxy including mod_mime.h).
  + Module-private header files (the proxy, mod_mime, the regex library,
  + and mod_rewrite) have not been moved to src/include; nor have
  + the OS-abstraction files.
  +
 *) Fix a bug where r->hostname didn't have the :port stripped
from it.  [Dean Gaudet]
   
  
  
  
  1.180 +0 -2  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.179
  retrieving revision 1.180
  diff -u -r1.179 -r1.180
  --- Configure 1998/02/01 15:56:14 1.179
  +++ Configure 1998/02/01 16:33:10 1.180
  @@ -873,7 +873,6 @@
   if [ "$RULE_WANTHSREGEX" = "yes" ]; then
   REGLIB="regex/libregex.a"
   SUBDIRS="$SUBDIRS regex"
  -#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
   fi
   
   # create modules.c
  @@ -991,7 +990,6 @@
   echo "CFLAGS1=$CFLAGS">> Makefile.config
   echo "INCLUDES1=$INCLUDES">> Makefile.config
   
  -#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
   INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR include"
   incprefix="-I"
   for depth in 0 1 2; do
  
  
  
  1.3   +6 -5  apache-1.3/src/regex/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl 1997/11/16 01:20:38 1.2
  +++ Makefile.tmpl 1998/02/01 16:33:12 1.3
  @@ -4,7 +4,7 @@
   # Put -Dconst= in for a pre-ANSI compiler.
   # Do not take -DPOSIX_MISTAKE out.
   # REGCFLAGS isn't important to you (it's for my use in some special 
contexts).
  -CFLAGS=-I. -DPOSIX_MISTAKE $(AUX_CFLAGS)
  +CFLAGS=-I. -I../include -DPOSIX_MISTAKE $(AUX_CFLAGS)
   
   # If you have a pre-ANSI compiler, put -o into MKHFLAGS.  If you want
   # the Berkeley __P macro, put -b in.
  @@ -46,16 +46,16 @@
rm -f *.o
   
   # stuff to build regex.h
  -REGEXH=regex.h
  +REGEXH=../include/regex.h
   REGEXHSRC=regex2.h $(REGSRC)
   $(REGEXH):   $(REGEXHSRC) mkh
  - sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.h
  + sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
   
   #cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
   #rm -f regex.tmp
   
   # dependencies
  -$(OBJPRODN) debug.o: utils.h regex.h regex2.h
  +$(OBJPRODN) debug.o: utils.h $(REGEXH) regex2.h
   regcomp.o:   cclass.h cname.h regcomp.ih
   regexec.o:   engine.c engine.ih
   regerror.o:  regerror.ih
  @@ -105,7 +105,8 @@
   
   
   mf.tmp:  Makefile
  - sed '/^REGEXH=/s/=.*/=regex.h/' Makefile | sed '/#DEL$$/d' >$@
  + sed '/^REGEXH=/s/=.*/=..\/include\\regex.h/' Makefile \
  + | sed '/#DEL$$/d' >$@
   
   DTRH=cclass.h cname.h regex2.h utils.h
   PRE=COPYRIGHT README WHATSNEW

cvs commit: apache-1.3/src CHANGES

1998-02-01 Thread coar

coar98/02/01 08:35:43

  Modified:src  CHANGES
  Log:
Considered leaving my name off that last change.. not really,
just forgot. :-)
  
  Revision  ChangesPath
  1.611 +1 -1  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.610
  retrieving revision 1.611
  diff -u -r1.610 -r1.611
  --- CHANGES   1998/02/01 16:33:08 1.610
  +++ CHANGES   1998/02/01 16:35:42 1.611
  @@ -8,7 +8,7 @@
other than kosher manner (e.g., the proxy including mod_mime.h).
Module-private header files (the proxy, mod_mime, the regex library,
and mod_rewrite) have not been moved to src/include; nor have
  - the OS-abstraction files.
  + the OS-abstraction files.  [Ken Coar]
   
 *) Fix a bug where r->hostname didn't have the :port stripped
from it.  [Dean Gaudet]

cvs commit: apache-1.3 STATUS

1998-02-01 Thread coar

coar98/02/01 08:37:29

  Modified:.STATUS
  Log:
Sunny and cold.  (Why are we doing this??)
  
  Revision  ChangesPath
  1.140 +1 -4  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- STATUS1998/02/01 00:21:13 1.139
  +++ STATUS1998/02/01 16:37:29 1.140
  @@ -143,6 +143,7 @@
   * r->allowed cleanup
   * References to undefined 'cwd' cell fixed in suexec.c
   * fix options/allowoverride merging
  +* Ken's restructuring the header files into src/include
   
   Available Patches:
   
  @@ -228,10 +229,6 @@
apprivate_xxx:
appri_xxx:
httpd_xxx: Ken +1
  -
  -* Maybe moving *all* of the *.h header files into a new
  -  src/include directory?
  - Status: Ken +1, Dean +1
   
   * Ken's [POLL] apachen/patches directory
 Shall we experiment with allowing patches to be distributed for

cvs commit: apache-1.3/src/main Makefile.tmpl

1998-02-01 Thread coar

coar98/02/01 08:44:29

  Modified:src/main Makefile.tmpl
  Log:
The mod_*.o files aren't in this directory any more, so they
don't need to replace space with confusion in the Makefile.
  
  Revision  ChangesPath
  1.9   +0 -108apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.tmpl 1998/02/01 15:56:20 1.8
  +++ Makefile.tmpl 1998/02/01 16:44:28 1.9
  @@ -78,114 +78,6 @@
$(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
$(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
   md5c.o: md5c.c $(INCDIR)/conf.h $(INCDIR)/md5.h
  -mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_config.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h
  -mod_actions.o: mod_actions.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  - $(INCDIR)/util_script.h
  -mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h 
$(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h
  -mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_log.h $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_request.h
  -mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  -mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_request.h
  -mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  -mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  -mod_auth_msql.o: mod_auth_msql.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  -mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  - $(INCDIR)/util_script.h
  -mod_browser.o: mod_browser.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
  -mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/util_script.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h
  -mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  - $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
  - $(INCDIR)/http_conf_globals.h
  -mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/util_md5.h $(INCDIR)/md5.h
  -mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  - $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  - $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/util_script.h
  -mod_dld.o: mod_dld.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h
  -mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
  - $(INCDIR)/buff.h $(INCDIR)/http_config.h
  -mod_expires.o: mod_expires.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
  - $(INCDIR)/http_log.h
  -mod_headers.o: mod_headers.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_c

cvs commit: apache-devsite anoncvs.txt

1998-02-01 Thread marc

marc98/02/01 12:19:20

  Modified:.anoncvs.txt
  Log:
  Misc updates for source tree changes.  Really should be rewritten as
  a document as opposed to a mail message now that more sites are using
  anoncvs.
  
  Revision  ChangesPath
  1.4   +10 -22apache-devsite/anoncvs.txt
  
  Index: anoncvs.txt
  ===
  RCS file: /export/home/cvs/apache-devsite/anoncvs.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- anoncvs.txt   1998/01/27 07:51:59 1.3
  +++ anoncvs.txt   1998/02/01 20:19:18 1.4
  @@ -1,11 +1,3 @@
  -
  -From [EMAIL PROTECTED] Fri Aug 22 20:23:50 1997
  -Date: Sun, 17 Aug 1997 12:55:12 -0600 (MDT)
  -From: Marc Slemko <[EMAIL PROTECTED]>
  -Reply-To: new-httpd@apache.org
  -To: TLOSAP 
  -Subject: how to use anoncvs
  -
 HOW TO USE ANONCVS
   ==
   
  @@ -58,14 +50,14 @@
   
   To checkout the current 1.2 tree:
   
  -  [EMAIL PROTECTED]:~$ cvs checkout -rAPACHE_1_2_X apache
  +  [EMAIL PROTECTED]:~$ cvs checkout apache-1.2
   
   After 1.3a1, there was a source tree reorganization which resulted
  -in the tree being split into apache and apache-1.3.  apache is everything
  -from before the reorganization, apache-1.3 is from after.  apache-1.3 still
  -retains the change histories of the files, however since they are
  -in different locations you can not build an apache-1.3 tree from 
  -before the reorganization.
  +in the tree being split into apache-1.2 and apache-1.3.  apache-1.2
  +is everything from before the reorganization, apache-1.3 is from
  +after.  apache-1.3 still retains the change histories of the files,
  +however since they are in different locations you can not build an
  +apache-1.3 tree from before the reorganization.
   
   To update your local tree to the latest version:
   
  @@ -75,12 +67,7 @@
   
 [EMAIL PROTECTED]:~/apache-1.3/$ cvs update -dP .
   
  -etc.  If you have a branch such as the 1.2 branch checked out, you need
  -to use something like:
  -   
  -  [EMAIL PROTECTED]:~$ cvs update -rAPACHE_1_2_X -dP apache
  -
  -While doing any update, you will notice several different status flags, eg.:
  +etc.  
   
 P core/buff.c
 P core/conf.h
  @@ -100,7 +87,7 @@
   To obtain a diff of changes between your checked out copy and 
   the source tree at the time you checked it out:
   
  -  [EMAIL PROTECTED]:~$ cvs diff -u apache
  +  [EMAIL PROTECTED]:~$ cvs diff -u apache-1.3
   
   To obtain a diff against the current source tree, be sure to
   do an update before the diff.
  @@ -113,5 +100,6 @@
   
   This anoncvs server is updated periodically from the main CVS
   repository, so it will lag a bit behind the current tree. 
  -Currently, updates occur every two hours at 23 after the hour.
  +Currently, updates occur every two hours at 23 after the hour, in
  +normal time zones.

cvs commit: apache-1.3/src/include alloc.h

1998-02-01 Thread dgaudet

dgaudet 98/02/01 12:54:46

  Modified:src/main alloc.c
   src/include alloc.h
  Log:
  the new table_xxxn() API should use const char * pointers
  
  Revision  ChangesPath
  1.74  +10 -10apache-1.3/src/main/alloc.c
  
  Index: alloc.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- alloc.c   1998/01/31 00:24:32 1.73
  +++ alloc.c   1998/02/01 20:54:44 1.74
  @@ -1003,7 +1003,7 @@
   }
   }
   
  -API_EXPORT(void) table_setn(table *t, char *key, char *val)
  +API_EXPORT(void) table_setn(table *t, const char *key, const char *val)
   {
   register int i, j, k;
   table_entry *elts = (table_entry *) t->a.elts;
  @@ -1025,7 +1025,7 @@
   for (i = 0; i < t->a.nelts; ) {
if (!strcasecmp(elts[i].key, key)) {
if (!done) {
  - elts[i].val =  val;
  + elts[i].val = (char *)val;
done = 1;
++i;
}
  @@ -1044,8 +1044,8 @@
   
   if (!done) {
elts = (table_entry *) table_push(t);
  - elts->key = key;
  - elts->val = val;
  + elts->key = (char *)key;
  + elts->val = (char *)val;
   }
   }
   
  @@ -1090,7 +1090,7 @@
   elts->val = pstrdup(t->a.pool, val);
   }
   
  -API_EXPORT(void) table_mergen(table *t, char *key, char *val)
  +API_EXPORT(void) table_mergen(table *t, const char *key, const char *val)
   {
   table_entry *elts = (table_entry *) t->a.elts;
   int i;
  @@ -1116,8 +1116,8 @@
   }
   
   elts = (table_entry *) table_push(t);
  -elts->key = key;
  -elts->val = val;
  +elts->key = (char *)key;
  +elts->val = (char *)val;
   }
   
   API_EXPORT(void) table_add(table *t, const char *key, const char *val)
  @@ -1129,7 +1129,7 @@
   elts->val = pstrdup(t->a.pool, val);
   }
   
  -API_EXPORT(void) table_addn(table *t, char *key, char *val)
  +API_EXPORT(void) table_addn(table *t, const char *key, const char *val)
   {
   table_entry *elts = (table_entry *) t->a.elts;
   
  @@ -1147,8 +1147,8 @@
   #endif
   
   elts = (table_entry *) table_push(t);
  -elts->key = key;
  -elts->val = val;
  +elts->key = (char *)key;
  +elts->val = (char *)val;
   }
   
   API_EXPORT(table *) overlay_tables(pool *p, const table *overlay, const 
table *base)
  
  
  
  1.45  +3 -3  apache-1.3/src/include/alloc.h
  
  Index: alloc.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- alloc.h   1998/01/27 10:00:40 1.44
  +++ alloc.h   1998/02/01 20:54:45 1.45
  @@ -164,12 +164,12 @@
   API_EXPORT(void) clear_table(table *);
   API_EXPORT(char *) table_get(const table *, const char *);
   API_EXPORT(void) table_set(table *, const char *name, const char *val);
  -API_EXPORT(void) table_setn(table *, char *name, char *val);
  +API_EXPORT(void) table_setn(table *, const char *name, const char *val);
   API_EXPORT(void) table_merge(table *, const char *name, const char 
*more_val);
  -API_EXPORT(void) table_mergen(table *, char *name, char *more_val);
  +API_EXPORT(void) table_mergen(table *, const char *name, const char 
*more_val);
   API_EXPORT(void) table_unset(table *, const char *key);
   API_EXPORT(void) table_add(table *, const char *name, const char *val);
  -API_EXPORT(void) table_addn(table *, char *name, char *val);
  +API_EXPORT(void) table_addn(table *, const char *name, const char *val);
   API_EXPORT(void) table_do(int (*comp) (void *, const char *, const char *), 
void *rec,
  const table *t,...);

cvs commit: apache-1.3/src/main http_vhost.c

1998-02-01 Thread dgaudet

dgaudet 98/02/01 13:19:31

  Modified:src/main http_vhost.c
  Log:
  really fix the hostname problem, without a SEGV on proxied urls this time
  
  Revision  ChangesPath
  1.6   +5 -8  apache-1.3/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_vhost.c  1998/02/01 04:54:47 1.5
  +++ http_vhost.c  1998/02/01 21:19:30 1.6
  @@ -737,19 +737,16 @@
   
   void update_vhost_from_headers(request_rec *r)
   {
  +/* must set this for HTTP/1.1 support */
  +if (r->hostname || (r->hostname = table_get(r->headers_in, "Host"))) {
  + fix_hostname(r);
  +}
   /* check if we tucked away a name_chain */
   if (r->connection->vhost_lookup_data) {
  -if (r->hostname || (r->hostname = table_get(r->headers_in, "Host"))) 
{
  - fix_hostname(r);
  +if (r->hostname)
   check_hostalias(r);
  - }
   else
   check_serverpath(r);
  -}
  -else if (!r->hostname) {
  -/* must set this for HTTP/1.1 support */
  -r->hostname = table_get(r->headers_in, "Host");
  - fix_hostname(r);
   }
   }

cvs commit: apache-1.3/src/modules/standard mod_dir.c mod_imap.c mod_rewrite.c mod_speling.c

1998-02-01 Thread dgaudet

.62
  +++ http_config.h 1998/02/01 22:05:33 1.63
  @@ -253,7 +253,7 @@
* handle it back-compatibly, or at least signal an error).
*/
   
  -#define MODULE_MAGIC_NUMBER 19980126
  +#define MODULE_MAGIC_NUMBER 19980201
   #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
   
   /* Generic accessors for other modules to get at their own module-specific
  
  
  
  1.34  +9 -0  apache-1.3/src/include/http_core.h
  
  Index: http_core.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- http_core.h   1998/01/26 18:24:32 1.33
  +++ http_core.h   1998/02/01 22:05:34 1.34
  @@ -97,6 +97,13 @@
  */
   API_EXPORT(const char *) get_remote_host(conn_rec *conn, void *dir_config, 
int type);
   API_EXPORT(const char *) get_remote_logname(request_rec *r);
  +
  +/* Used for constructing self-referencing URLs, and things like SERVER_PORT,
  + * and SERVER_NAME.
  + */
  +API_EXPORT(char *) construct_url(pool *p, const char *uri, const request_rec 
*r);
  +API_EXPORT(const char *) get_server_name(const request_rec *r);
  +API_EXPORT(unsigned) get_server_port(const request_rec *r);

   /* Authentication stuff.  This is one of the places where compatibility
* with the old config files *really* hurts; they don't discriminate at
  @@ -175,6 +182,8 @@
   int do_rfc1413 : 2;   /* See if client is advertising a username? */
   
   int content_md5 : 2;  /* calculate Content-MD5? */
  +
  +unsigned use_canonical_name : 2; /* bit 0 = on/off, bit 1 = unset/set */
   
   /* since is_fnmatch(conf->d) was being called so frequently in
* directory_walk() and its relatives, this field was created and
  
  
  
  1.179 +0 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -u -r1.178 -r1.179
  --- httpd.h   1998/01/30 03:36:57 1.178
  +++ httpd.h   1998/02/01 22:05:34 1.179
  @@ -803,8 +803,6 @@
   API_EXPORT(char *) escape_html(pool *p, const char *s);
   API_EXPORT(char *) construct_server(pool *p, const char *hostname,
unsigned port);
  -API_EXPORT(char *) construct_url(pool *p, const char *path,
  -  const server_rec *s);
   API_EXPORT(char *) escape_shell_cmd(pool *p, const char *s);
   
   API_EXPORT(int) count_dirs(const char *path);
  
  
  
  1.154 +70 -0 apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- http_core.c   1998/01/30 19:30:34 1.153
  +++ http_core.c   1998/02/01 22:05:36 1.154
  @@ -118,6 +118,8 @@
   
   conf->content_md5 = 2;
   
  +conf->use_canonical_name = 1 | 2;/* 2 = unset, default on */
  +
   conf->hostname_lookups = HOSTNAME_LOOKUP_UNSET;
   conf->do_rfc1413 = DEFAULT_RFC1413 | 2;  /* set bit 1 to indicate 
default */
   conf->satisfy = SATISFY_NOSPEC;
  @@ -190,6 +192,9 @@
conf->hostname_lookups = new->hostname_lookups;
   if ((new->do_rfc1413 & 2) == 0) conf->do_rfc1413 = new->do_rfc1413;
   if ((new->content_md5 & 2) == 0) conf->content_md5 = new->content_md5;
  +if ((new->use_canonical_name & 2) == 0) {
  + conf->use_canonical_name = new->use_canonical_name;
  +}
   
   #ifdef RLIMIT_CPU
   if (new->limit_cpu) conf->limit_cpu = new->limit_cpu;
  @@ -563,6 +568,59 @@
return NULL;
   }
   
  +/* There are two options regarding what the "name" of a server is.  The
  + * "canonical" name as defined by ServerName and Port, or the "client's
  + * name" as supplied by a possible Host: header or full URI.  We never
  + * trust the port passed in the client's headers, we always use the
  + * port of the actual socket.
  + */
  +API_EXPORT(const char *) get_server_name(const request_rec *r)
  +{
  +core_dir_config *d =
  +  (core_dir_config *)get_module_config(r->per_dir_config, &core_module);
  +
  +if (d->use_canonical_name & 1) {
  + return r->server->server_hostname;
  +}
  +return r->hostname ? r->hostname : r->server->server_hostname;
  +}
  +
  +API_EXPORT(unsigned) get_server_port(const request_rec *r)
  +{
  +core_dir_config *d =
  +  (core_dir_config *)get_module_config(r->per_dir_config, &core_module);
  +
  +if (d->use_canonica

cvs commit: apache-devsite mmn.txt

1998-02-01 Thread dgaudet

dgaudet 98/02/01 14:07:00

  Modified:.mmn.txt
  Log:
  update to 19980201
  
  Revision  ChangesPath
  1.9   +2 -0  apache-devsite/mmn.txt
  
  Index: mmn.txt
  ===
  RCS file: /export/home/cvs/apache-devsite/mmn.txt,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mmn.txt   1998/01/26 19:52:44 1.8
  +++ mmn.txt   1998/02/01 22:07:00 1.9
  @@ -27,3 +27,5 @@
   19971026 (1.3b3-dev) - custom config hooks in place
   19980126 (1.3b4-dev) - ap_cpystrn()
 - table_addn(), table_setn(), table_mergen()
  +19980201 (1.3b4-dev) - construct_url() prototype server_rec * -> request_rec 
*
  + - add get_server_name() and get_server_port()

cvs commit: apache-1.3/src/include - New directory

1998-02-01 Thread coar

coar98/02/01 07:49:27

  apache-1.3/src/include - New directory

cvs commit: apache-1.3 STATUS

cvs commit: apache-2.0 STATUS

cvs commit: apache-1.2/src http_protocol.c

cvs commit: apache-1.2/src CHANGES http_core.c mod_asis.c mod_dir.c mod_include.c mod_info.c

cvs commit: apache-1.2/src/modules/proxy mod_proxy.c

cvs commit: apache-1.3/src/main http_vhost.c

cvs commit: apache-1.3/src/ap Makefile.tmpl

cvs commit: apache-1.3/src/regex Makefile.tmpl

cvs commit: apache-1.3/src CHANGES

cvs commit: apache-1.3 STATUS

cvs commit: apache-1.3/src/main Makefile.tmpl

cvs commit: apache-devsite anoncvs.txt

cvs commit: apache-1.3/src/include alloc.h

cvs commit: apache-1.3/src/main http_vhost.c

cvs commit: apache-1.3/src/modules/standard mod_dir.c mod_imap.c mod_rewrite.c mod_speling.c

cvs commit: apache-devsite mmn.txt

cvs commit: apache-1.3/src/include - New directory

17 matches

Site Navigation

Mail list logo

Footer information