You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@hyperreal.org on 1999/05/19 15:26:10 UTC

cvs commit: apache-1.3/src/modules/standard mod_setenvif.c

coar        99/05/19 06:26:10

  Modified:    .        STATUS
               htdocs/manual/mod mod_setenvif.html
               src      CHANGES
               src/modules/standard mod_setenvif.c
  Log:
  	Allow SetEnvIf* to set things according to the protocol of
  	the request.
  
  Revision  Changes    Path
  1.688     +1 -5      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.687
  retrieving revision 1.688
  diff -u -r1.687 -r1.688
  --- STATUS	1999/05/17 18:02:51	1.687
  +++ STATUS	1999/05/19 13:26:03	1.688
  @@ -1,5 +1,5 @@
     1.3 STATUS:
  -  Last modified at [$Date: 1999/05/17 18:02:51 $]
  +  Last modified at [$Date: 1999/05/19 13:26:03 $]
   
   Release:
   
  @@ -132,10 +132,6 @@
       * Ronald Tschal�r's major update of mod_digest
           Message-ID: <19...@chill.innovation.ch>
           Status: Big change -- needs review.
  -
  -    * Ken's patch to add the request protocol to things mod_setenvif can test
  -	Message-ID: <37...@Golux.Com>
  -	Status: Ken +1
   
   In progress:
   
  
  
  
  1.6       +6 -1      apache-1.3/htdocs/manual/mod/mod_setenvif.html
  
  Index: mod_setenvif.html
  ===================================================================
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_setenvif.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_setenvif.html	1998/05/28 14:06:54	1.5
  +++ mod_setenvif.html	1999/05/19 13:26:06	1.6
  @@ -260,7 +260,8 @@
     <A
      HREF="directive-dict.html#Compatibility"
      REL="Help"
  -  ><STRONG>Compatibility:</STRONG></A> Apache 1.3 and above
  +  ><STRONG>Compatibility:</STRONG></A> Apache 1.3 and above; the
  +  Request_Protocol keyword is only available with 1.3.7 and later
     </P>
     <P>
     The <SAMP>SetEnvIf</SAMP> directive defines environment variables
  @@ -284,6 +285,10 @@
      </LI>
      <LI><SAMP>Request_Method</SAMP> - the name of the method being used
       (<SAMP>GET</SAMP>, <SAMP>POST</SAMP>, <EM>et cetera</EM>)
  +   </LI>
  +   <LI><SAMP>Request_Protocol</SAMP> - the name and version of the protocol
  +    with which the request was made (<EM>e.g.</EM>, "HTTP/0.9", "HTTP/1.1",
  +    <EM>etc.</EM>)
      </LI>
      <LI><SAMP>Request_URI</SAMP> - the portion of the URL following the
       scheme and host portion
  
  
  
  1.1360    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1359
  retrieving revision 1.1360
  diff -u -r1.1359 -r1.1360
  --- CHANGES	1999/05/17 08:00:02	1.1359
  +++ CHANGES	1999/05/19 13:26:07	1.1360
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.7
   
  +  *) Add 'Request_Protocol' special keyword to mod_setenvif so that
  +     environment variables can be set according to the protocol version
  +     (e.g., HTTP/0.9 or HTTP/1.1) of the request.  [Ken Coar]
  +
     *) Add DSO support for OpenStep (Mach 4.2) platform.
        [Ralf S. Engelschall, Rex Dieter <rd...@math.unl.edu>] PR#3997
   
  
  
  
  1.27      +8 -1      apache-1.3/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_setenvif.c	1999/01/01 19:05:13	1.26
  +++ mod_setenvif.c	1999/05/19 13:26:09	1.27
  @@ -125,7 +125,8 @@
       SPECIAL_REMOTE_HOST,
       SPECIAL_REMOTE_USER,
       SPECIAL_REQUEST_URI,
  -    SPECIAL_REQUEST_METHOD
  +    SPECIAL_REQUEST_METHOD,
  +    SPECIAL_REQUEST_PROTOCOL
   };
   typedef struct {
       char *name;                 /* header name */
  @@ -241,6 +242,9 @@
   	else if (!strcasecmp(fname, "request_method")) {
   	    new->special_type = SPECIAL_REQUEST_METHOD;
   	}
  +	else if (!strcasecmp(fname, "request_protocol")) {
  +	    new->special_type = SPECIAL_REQUEST_PROTOCOL;
  +	}
   	else {
   	    new->special_type = SPECIAL_NOT;
   	}
  @@ -354,6 +358,9 @@
   		break;
   	    case SPECIAL_REQUEST_METHOD:
   		val = r->method;
  +		break;
  +	    case SPECIAL_REQUEST_PROTOCOL:
  +		val = r->protocol;
   		break;
   	    case SPECIAL_NOT:
   		val = ap_table_get(r->headers_in, b->name);