httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@locus.apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
Date Wed, 15 Nov 2000 02:51:50 GMT
fanf        00/11/14 18:51:50

  Modified:    src      CHANGES
               src/modules/standard mod_vhost_alias.c
  Log:
  Make cgi-bin work as a regular directory when using mod_vhost_alias
  with no VirtualScriptAlias directives.
  PR:     6829
  
  Revision  Changes    Path
  1.1601    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1600
  retrieving revision 1.1601
  diff -u -u -r1.1600 -r1.1601
  --- CHANGES	2000/11/13 04:52:21	1.1600
  +++ CHANGES	2000/11/15 02:51:49	1.1601
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.15
   
  +  *) Make cgi-bin work as a regular directory when using mod_vhost_alias
  +     with no VirtualScriptAlias directives. PR#6829 [Tony Finch]
  +
     *) Move the check of the Expect request header field after the hook
        for ap_post_read_request, since that is the only opportunity for
        modules to handle Expect extensions.
  
  
  
  1.10      +6 -3      apache-1.3/src/modules/standard/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- mod_vhost_alias.c	2000/11/14 09:57:28	1.9
  +++ mod_vhost_alias.c	2000/11/15 02:51:50	1.10
  @@ -416,9 +416,12 @@
     
       conf = (mva_sconf_t *) ap_get_module_config(r->server->module_config,
   					      &vhost_alias_module);
  -    cgi = strstr(r->uri, "cgi-bin/");
  -    if (cgi && cgi - r->uri != strspn(r->uri, "/")) {
  -        cgi = NULL;
  +    cgi = NULL;
  +    if (conf->cgi_root) {
  +	cgi = strstr(r->uri, "cgi-bin/");
  +	if (cgi && cgi - r->uri != strspn(r->uri, "/")) {
  +	    cgi = NULL;
  +	}
       }
       if (cgi) {
   	mode = conf->cgi_root_mode;
  
  
  

Mime
View raw message