httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject apache-1.1.1 snapshot uploaded
Date Mon, 08 Jul 1996 15:09:51 GMT

I've uploaded a 1.1.1 snapshot to /export/pub/httpd/incoming
The following patches have been applied.

mod_alias fix - from Nathan Neulinger
mod_auth_msql fix - from Dirk vanGulik
OS/2 scoreboard fix - from Garey Smiley

Roy suggested a mod_negotiation fix from Alexei that I have not
patch for.

I'm including below the patch to bring the tree up to 1.1.1.
Since I don't have commit privledge, someone else will have to
take the ball.

Index: src/http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.42
diff -c -r1.42 http_main.c
*** http_main.c	1996/06/26 22:52:10	1.42
--- http_main.c	1996/07/08 15:04:59
***************
*** 606,612 ****
--- 606,617 ----
  
      have_scoreboard_fname = 1;
      
+ #ifdef __EMX__
+     /* OS/2 needs binary mode set. */
+     scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
+ #else
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0644);
+ #endif
      if (scoreboard_fd == -1)
      {
  	fprintf (stderr, "Cannot open scoreboard file:\n");
***************
*** 626,632 ****
--- 631,642 ----
  #if !defined(HAVE_MMAP) && !defined(HAVE_SHMGET)
      if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
      
+ #ifdef __EMX__    
+     /* OS/2 needs binary mode set. */
+     scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0666);
+ #else
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0666);
+ #endif
      if (scoreboard_fd == -1)
      {
  	fprintf (stderr, "Cannot open scoreboard file:\n");
Index: src/httpd.h
===================================================================
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.36.2.1
diff -c -r1.36.2.1 httpd.h
*** httpd.h	1996/07/03 22:55:01	1.36.2.1
--- httpd.h	1996/07/08 15:05:29
***************
*** 238,244 ****
   * Example: "Apache/1.1b3 MrWidget/0.1-alpha" 
   */
  
! #define SERVER_VERSION "Apache/1.1.1-dev" /* SEE COMMENTS ABOVE */
  
  #define SERVER_PROTOCOL "HTTP/1.0"
  #define SERVER_SUPPORT "http://www.apache.org/"
--- 238,244 ----
   * Example: "Apache/1.1b3 MrWidget/0.1-alpha" 
   */
  
! #define SERVER_VERSION "Apache/1.1.1" /* SEE COMMENTS ABOVE */
  
  #define SERVER_PROTOCOL "HTTP/1.0"
  #define SERVER_SUPPORT "http://www.apache.org/"
Index: src/mod_alias.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_alias.c,v
retrieving revision 1.4
diff -c -r1.4 mod_alias.c
*** mod_alias.c	1996/03/31 01:07:00	1.4
--- mod_alias.c	1996/07/08 15:05:44
***************
*** 74,79 ****
--- 74,82 ----
      array_header *redirects;
  } alias_server_conf;
  
+ typedef struct {
+     array_header *redirects;
+ } alias_dir_conf;
  module alias_module;
  
  void *create_alias_config (pool *p, server_rec *s)
***************
*** 86,91 ****
--- 89,101 ----
      return a;
  }
  
+ void *create_alias_dir_config (pool *p, char *d)
+ {
+     alias_dir_conf *a =
+       (alias_dir_conf *)pcalloc (p, sizeof(alias_dir_conf));
+     a->redirects = make_array (p, 2, sizeof(alias_entry));
+     return a;
+ }
  void *merge_alias_config (pool *p, void *basev, void *overridesv)
  {
      alias_server_conf *a =
***************
*** 98,103 ****
--- 108,122 ----
      return a;
  }
  
+ void *merge_alias_dir_config (pool *p, void *basev, void *overridesv)
+ {
+     alias_dir_conf *a =
+       (alias_dir_conf *)pcalloc (p, sizeof(alias_dir_conf));
+     alias_dir_conf *base = (alias_dir_conf *)basev,
+       *overrides = (alias_dir_conf *)overridesv;
+     a->redirects = append_arrays (p, overrides->redirects, base->redirects);
+     return a;
+ }
  char *add_alias(cmd_parms *cmd, void *dummy, char *f, char *r)
  {
      server_rec *s = cmd->server;
***************
*** 111,125 ****
      return NULL;
  }
  
! char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url)
  {
      server_rec *s = cmd->server;
!     alias_server_conf *conf =
          (alias_server_conf *)get_module_config(s->module_config,&alias_module);
-     alias_entry *new = push_array (conf->redirects);
  
      if (!is_url (url)) return "Redirect to non-URL";
!     
      new->fake = f; new->real = url;
      return NULL;
  }
--- 130,151 ----
      return NULL;
  }
  
! char *add_redirect(cmd_parms *cmd, alias_dir_conf *dirconf, char *f, char *url)
  {
+     alias_entry *new;
      server_rec *s = cmd->server;
!     alias_server_conf *serverconf =
          (alias_server_conf *)get_module_config(s->module_config,&alias_module);
  
      if (!is_url (url)) return "Redirect to non-URL";
!     if ( cmd->path )
!     {
!         new = push_array (dirconf->redirects);
!     }
!     else
!     {
!         new = push_array (serverconf->redirects);
!     }
      new->fake = f; new->real = url;
      return NULL;
  }
***************
*** 198,204 ****
  int translate_alias_redir(request_rec *r)
  {
      void *sconf = r->server->module_config;
!     alias_server_conf *conf =
          (alias_server_conf *)get_module_config(sconf, &alias_module);
      char *ret;
  
--- 224,230 ----
  int translate_alias_redir(request_rec *r)
  {
      void *sconf = r->server->module_config;
!     alias_server_conf *serverconf =
          (alias_server_conf *)get_module_config(sconf, &alias_module);
      char *ret;
  
***************
*** 210,221 ****
  #endif    
          return BAD_REQUEST;
  
!     if ((ret = try_alias_list (r, conf->redirects, 1)) != NULL) {
          table_set (r->headers_out, "Location", ret);
          return REDIRECT;
      }
      
!     if ((ret = try_alias_list (r, conf->aliases, 0)) != NULL) {
          r->filename = ret;
          return OK;
      }
--- 236,247 ----
  #endif    
          return BAD_REQUEST;
  
!     if ((ret = try_alias_list (r, serverconf->redirects, 1)) != NULL) {
          table_set (r->headers_out, "Location", ret);
          return REDIRECT;
      }
      
!     if ((ret = try_alias_list (r, serverconf->aliases, 0)) != NULL) {
          r->filename = ret;
          return OK;
      }
***************
*** 225,238 ****
  
  int fixup_redir(request_rec *r)
  {
!     void *sconf = r->server->module_config;
!     alias_server_conf *conf =
!         (alias_server_conf *)get_module_config(sconf, &alias_module);
      char *ret;
  
      /* It may have changed since last time, so try again */
  
!     if ((ret = try_alias_list (r, conf->redirects, 1)) != NULL) {
          table_set (r->headers_out, "Location", ret);
          return REDIRECT;
      }
--- 251,264 ----
  
  int fixup_redir(request_rec *r)
  {
!     void *dconf = r->per_dir_config;
!     alias_dir_conf *dirconf =
!         (alias_dir_conf *)get_module_config(dconf, &alias_module);
      char *ret;
  
      /* It may have changed since last time, so try again */
  
!     if ((ret = try_alias_list (r, dirconf->redirects, 1)) != NULL) {
          table_set (r->headers_out, "Location", ret);
          return REDIRECT;
      }
***************
*** 243,250 ****
  module alias_module = {
     STANDARD_MODULE_STUFF,
     NULL,			/* initializer */
!    NULL,			/* dir config creater */
!    NULL,			/* dir merger --- default is to override */
     create_alias_config,		/* server config */
     merge_alias_config,		/* merge server configs */
     alias_cmds,			/* command table */
--- 269,276 ----
  module alias_module = {
     STANDARD_MODULE_STUFF,
     NULL,			/* initializer */
!    create_alias_dir_config,	/* dir config creater */
!    merge_alias_dir_config,	/* dir merger --- default is to override */
     create_alias_config,		/* server config */
     merge_alias_config,		/* merge server configs */
     alias_cmds,			/* command table */
Index: src/mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
retrieving revision 1.5
diff -c -r1.5 mod_auth_anon.c
*** mod_auth_anon.c	1996/05/29 03:19:17	1.5
--- mod_auth_anon.c	1996/07/08 15:05:50
***************
*** 75,81 ****
   * Anonymous_LogEmail		[ on | off ] default = on
   * Anonymous_VerifyEmail	[ on | off ] default = off
   * Anonymous_NoUserId		[ on | off ] default = off
!  * Anonymous_Authorative        [ on | off ] default = off
   *
   * The magic user id is something like 'anonymous', it is NOT case sensitive. 
   * 
--- 75,81 ----
   * Anonymous_LogEmail		[ on | off ] default = on
   * Anonymous_VerifyEmail	[ on | off ] default = off
   * Anonymous_NoUserId		[ on | off ] default = off
!  * Anonymous_Authoritative      [ on | off ] default = off
   *
   * The magic user id is something like 'anonymous', it is NOT case sensitive. 
   * 
Index: src/mod_auth_msql.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
retrieving revision 1.10
diff -c -r1.10 mod_auth_msql.c
*** mod_auth_msql.c	1996/07/01 19:04:08	1.10
--- mod_auth_msql.c	1996/07/08 15:06:08
***************
*** 284,289 ****
--- 284,293 ----
   *		Replaced some MAX_STRING_LENGTH claims. 
   *	   1.0  removed some error check as they where already done elsehwere
   *	        NumFields -> NumRows (Thanks Vitek). More stack memory.
+  *	   1.1	no logging of empty password strings.
+  * 	   1.2  Problem with the Backward vitek which cause it to check
+  *		even if msql_auth was not configured; Also more carefull
+  *		with the authorative stuff; caught by thomas@marvin.calvacom.fr.
   */
  
  
***************
*** 392,400 ****
  #include "http_log.h"
  #include "http_protocol.h"
  #include <msql.h>
- #ifdef HAVE_CRYPT_H
  #include <crypt.h>
- #endif
  
  typedef struct  {
  
--- 396,402 ----
***************
*** 778,788 ****
       * We do not check on dbase, group, userid or host name, as it is
       * perfectly possible to only do group control with mSQL and leave
       * user control to the next (dbm) guy in line.
       */
!     if (
!     	(!sec->auth_msql_pwd_table) &&
!     	(!sec->auth_msql_pwd_field)
! 	 ) return DECLINED;
  
      if(!(real_pw = get_msql_pw(r, c->user, sec,msql_errstr ))) {
  	if ( msql_errstr[0] ) {
--- 780,789 ----
       * We do not check on dbase, group, userid or host name, as it is
       * perfectly possible to only do group control with mSQL and leave
       * user control to the next (dbm) guy in line.
+      * We no longer check on the user field name; to avoid problems
+      * with Backward VITEK.
       */
!     if (!sec->auth_msql_pwd_table) return DECLINED;
  
      if(!(real_pw = get_msql_pw(r, c->user, sec,msql_errstr ))) {
  	if ( msql_errstr[0] ) {
***************
*** 809,816 ****
--- 810,819 ----
       */
  
      if ((sec->auth_msql_nopasswd) && (!strlen(real_pw))) {
+ /*
          sprintf(msql_errstr,"mSQL: user %s: Empty/'any' password accepted",c->user);
  	log_reason (msql_errstr, r->uri, r);
+  */
  	return OK;
  	};
  
***************
*** 861,866 ****
--- 864,872 ----
      register int x;
      char *t, *w;
      msql_errstr[0]='\0';
+ 
+     /* If we are not configured, ignore */
+     if (!sec->auth_msql_pwd_table) return DECLINED;
  
      if (!reqs_arr) {
  	if (sec->auth_msql_authorative) {




Mime
View raw message