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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103917 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5db6e8a279e67149b324c295dbed0e78eca22291..1f097babcd9d6b74c1d1d314b55af06d381fa74b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/STATUS b/STATUS
index 9c4fd3108be41bb5f203e98d231da76d73fe717d..979788b924dcc9ba55ebdf974fa8ccc45c7e45e4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/06/11 20:27:26 $]
+Last modified at [$Date: 2004/06/11 20:46:40 $]
 
 Release:
 
@@ -112,12 +112,6 @@ PATCHES TO BACKPORT FROM 2.1
          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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index ca3721bdc2324c3876cedafb54835fa4f523c3fb..16724d1b99e216e4d36502824fd4e1e1f4b1e04e 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index d824d89068d49d7409d6795fe743fcc2c5273417..6522267e8b1d6c4153d8e9e2d2363bb6d8a0fe5e 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -685,8 +685,8 @@ AP_DECLARE_NONSTD(apr_status_t) ap_old_write_filter(ap_filter_t *f, apr_bucket_b
  * 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
 }

diff --git a/server/protocol.c b/server/protocol.c
index fbe6d0ed709634cdee311afe9b04c95b8fa524a4..8d24daa443bf462e5e8e23cae594dbcbc2cdd74b 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -991,7 +991,8 @@ request_rec *ap_read_request(conn_rec *conn)
  * *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 @@ static void end_output_stream(request_rec *r)
     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) {