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-2.0/src/modules/standard mod_vhost_alias.c
Date Wed, 15 Nov 2000 02:54:48 GMT
fanf        00/11/14 18:54:48

  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.331     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.330
  retrieving revision 1.331
  diff -u -u -r1.330 -r1.331
  --- CHANGES	2000/11/14 23:58:54	1.330
  +++ CHANGES	2000/11/15 02:54:48	1.331
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a8
  +
  +  *) Make cgi-bin work as a regular directory when using mod_vhost_alias
  +     with no VirtualScriptAlias directives. PR#6829 [Tony Finch]
  +
     *) Remove BUFF from the PROXY connect handling. [Ryan Bloom]
   
     *) Get the default_handler to stop trying to deal with HEAD requests.
  
  
  
  1.17      +6 -3      apache-2.0/src/modules/standard/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -u -r1.16 -r1.17
  --- mod_vhost_alias.c	2000/11/14 01:45:11	1.16
  +++ mod_vhost_alias.c	2000/11/15 02:54:48	1.17
  @@ -424,9 +424,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