httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Tue, 03 Dec 2002 08:38:46 GMT
jerenkrantz    2002/12/03 00:38:45

  Modified:    .        CHANGES
               server   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.
  
  Obtained from: apache-1.3
  
  Revision  Changes    Path
  1.1003    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1002
  retrieving revision 1.1003
  diff -u -u -r1.1002 -r1.1003
  --- CHANGES	3 Dec 2002 00:37:16 -0000	1.1002
  +++ CHANGES	3 Dec 2002 08:38:43 -0000	1.1003
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) 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]
  +
     *) Rewrite of aaa modules to an authn/authz model.
        [Dirk-Willem van Gulik, Justin Erenkrantz]
   
  
  
  
  1.122     +6 -6      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -u -r1.121 -r1.122
  --- protocol.c	19 Nov 2002 19:32:38 -0000	1.121
  +++ protocol.c	3 Dec 2002 08:38:45 -0000	1.122
  @@ -1007,6 +1007,12 @@
           return r;
       }
   
  +    if ((access_status = ap_run_post_read_request(r))) {
  +        ap_die(access_status, r);
  +        ap_run_log_transaction(r);
  +        return NULL;
  +    }
  +
       if (((expect = apr_table_get(r->headers_in, "Expect")) != NULL)
           && (expect[0] != '\0')) {
           /*
  @@ -1031,12 +1037,6 @@
   
       ap_add_input_filter_handle(ap_http_input_filter_handle,
                                  NULL, r, r->connection);
  -
  -    if ((access_status = ap_run_post_read_request(r))) {
  -        ap_die(access_status, r);
  -        ap_run_log_transaction(r);
  -        return NULL;
  -    }
   
       return r;
   }
  
  
  

Mime
View raw message