httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-1.3/src/main http_protocol.c
Date Mon, 13 Nov 2000 04:52:22 GMT
fielding    00/11/12 20:52:22

  Modified:    src      CHANGES
               src/main http_protocol.c
  Log:
  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.
  
  Submitted by:	Justin Erenkrantz <jerenkrantz@eBuilt.com>
  Reviewed by:	Roy Fielding
  
  Revision  Changes    Path
  1.1600    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1599
  retrieving revision 1.1600
  diff -u -r1.1599 -r1.1600
  --- CHANGES	2000/11/10 16:01:31	1.1599
  +++ CHANGES	2000/11/13 04:52:21	1.1600
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.15
   
  +  *) 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.
  +     [Justin Erenkrantz <jerenkrantz@eBuilt.com>]
  +
     *) Each Netware thread is created in its own thread group to ensure 
        that any context change applies only to the thread in which the 
        change was made.  [Brad Nicholes <BNICHOLES@novell.com>]
  
  
  
  1.293     +7 -6      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.292
  retrieving revision 1.293
  diff -u -r1.292 -r1.293
  --- http_protocol.c	2000/11/06 22:05:13	1.292
  +++ http_protocol.c	2000/11/13 04:52:22	1.293
  @@ -1124,6 +1124,13 @@
           ap_log_transaction(r);
           return r;
       }
  +
  +    if ((access_status = ap_run_post_read_request(r))) {
  +        ap_die(access_status, r);
  +        ap_log_transaction(r);
  +        return NULL;
  +    }
  +
       if (((expect = ap_table_get(r->headers_in, "Expect")) != NULL) &&
           (expect[0] != '\0')) {
           /*
  @@ -1145,12 +1152,6 @@
               ap_log_transaction(r);
               return r;
           }
  -    }
  -
  -    if ((access_status = ap_run_post_read_request(r))) {
  -        ap_die(access_status, r);
  -        ap_log_transaction(r);
  -        return NULL;
       }
   
       return r;
  
  
  

Mime
View raw message