httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Fri, 11 Jun 2004 20:46:41 GMT
nd          2004/06/11 13:46:41

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               include  Tag: APACHE_2_0_BRANCH ap_mmn.h http_protocol.h
               server   Tag: APACHE_2_0_BRANCH protocol.c
  Log:
  ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
  exported on Win32 as well
  
  PR: 28523
  Submitted by: Edward Rudd <eddie omegaware.com>
  Reviewed by: Jeff Trawick, Brad Nicholes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.302 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.301
  retrieving revision 1.988.2.302
  diff -u -u -r1.988.2.301 -r1.988.2.302
  --- CHANGES	11 Jun 2004 20:27:25 -0000	1.988.2.301
  +++ CHANGES	11 Jun 2004 20:46:40 -0000	1.988.2.302
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.50
   
  +  *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
  +     exported on Win32 and Netware as well (minor MMN bump).  PR 28523.
  +     [Edward Rudd <eddie omegaware.com>, André Malo]
  +
     *) Restore the ability to disable the use of AcceptEx on Win9x systems
        automatically (broken in 2.0.49). PR 28529.  [André Malo]
   
  
  
  
  1.751.2.919 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.918
  retrieving revision 1.751.2.919
  diff -u -u -r1.751.2.918 -r1.751.2.919
  --- STATUS	11 Jun 2004 20:27:26 -0000	1.751.2.918
  +++ STATUS	11 Jun 2004 20:46:40 -0000	1.751.2.919
  @@ -112,12 +112,6 @@
            modules/mappers/mod_actions.c: r1.32, r1.34
          +1: nd
   
  -    *) export ap_set_sub_req_protocol and ap_finalize_sub_req_protocol on Win32 and NetWare.
  -       (should be a minor MMN bump). PR 28523.
  -         server/protocol.c: r1.147
  -         include/http_protocol.h: r1.91
  -       +1: nd, trawick, bnicholes
  -
       *) allow symlinks on directories to be processed by Include directives
          and stop possible recursion by a counter. PR 28492
            server/config.c: r1.175
  
  
  
  No                   revision
  No                   revision
  1.52.2.11 +3 -1      httpd-2.0/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
  retrieving revision 1.52.2.10
  retrieving revision 1.52.2.11
  diff -u -u -r1.52.2.10 -r1.52.2.11
  --- ap_mmn.h	9 Feb 2004 20:54:33 -0000	1.52.2.10
  +++ ap_mmn.h	11 Jun 2004 20:46:41 -0000	1.52.2.11
  @@ -78,6 +78,8 @@
    * 20020903.5 (2.0.49-dev) add ap_escape_errorlog_item()
    * 20020903.6 (2.0.49-dev) add insert_error_filter hook
    * 20020903.7 (2.0.49-dev) added XHTML Doctypes
  + * 20020903.8 (2.0.50-dev) export ap_set_sub_req_protocol and
  + *                         ap_finalize_sub_req_protocol on Win32 and NetWare
    */
   
   #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
  @@ -85,7 +87,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 20020903
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 7                     /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 8                     /* 0...n */
   
   /**
    * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
  
  
  
  1.83.2.7  +2 -2      httpd-2.0/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
  retrieving revision 1.83.2.6
  retrieving revision 1.83.2.7
  diff -u -u -r1.83.2.6 -r1.83.2.7
  --- http_protocol.h	9 Feb 2004 20:54:34 -0000	1.83.2.6
  +++ http_protocol.h	11 Jun 2004 20:46:41 -0000	1.83.2.7
  @@ -685,8 +685,8 @@
    * Setting up the protocol fields for subsidiary requests...
    * Also, a wrapup function to keep the internal accounting straight.
    */
  -void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
  -void ap_finalize_sub_req_protocol(request_rec *sub_r);
  +AP_DECLARE(void) ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r);
  +AP_DECLARE(void) ap_finalize_sub_req_protocol(request_rec *sub_r);
                                                                                   
   #ifdef __cplusplus
   }
  
  
  
  No                   revision
  No                   revision
  1.121.2.18 +3 -2      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.121.2.17
  retrieving revision 1.121.2.18
  diff -u -u -r1.121.2.17 -r1.121.2.18
  --- protocol.c	13 May 2004 23:40:03 -0000	1.121.2.17
  +++ protocol.c	11 Jun 2004 20:46:41 -0000	1.121.2.18
  @@ -991,7 +991,8 @@
    * *someone* has to set the protocol-specific fields...
    */
   
  -void ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r)
  +AP_DECLARE(void) ap_set_sub_req_protocol(request_rec *rnew,
  +                                         const request_rec *r)
   {
       rnew->the_request     = r->the_request;  /* Keep original request-line */
   
  @@ -1029,7 +1030,7 @@
       ap_pass_brigade(r->output_filters, bb);
   }
   
  -void ap_finalize_sub_req_protocol(request_rec *sub)
  +AP_DECLARE(void) ap_finalize_sub_req_protocol(request_rec *sub)
   {
       /* tell the filter chain there is no more content coming */
       if (!sub->eos_sent) {
  
  
  

Mime
View raw message