Commit e1b48b23 authored by Chuck Murcko's avatar Chuck Murcko
Browse files

Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types of 

functions used by mod_proxy for export in DLL
Submitted by:	Ian Holsman <IanH@cnet.com>
Reviewed by:	Chuck murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89078 13f79535-47bb-0310-9956-ffa450edef68
parent 0746693c

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev



  *) Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types

     of functions used by mod_proxy for export in the DLL 

     [Ian Holsman <IanH@cnet.com>]



  *) Prevent a hang when a cgi handled by mod_cgid tries to read a

     request body from its stdin but no reqest body is being written to 

     the cgi.  [Jeff Trawick]

include/http_config.h

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server); 
 * @param p The pool to allocate the config vector out of

 * @return The config vector

 */

ap_conf_vector_t *ap_create_request_config(apr_pool_t *p);

AP_DECLARE(ap_conf_vector_t*) ap_create_request_config(apr_pool_t *p);



/**

 * Setup the config vector for per dir module configs

include/http_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern "C" { 
 * @param id ID of this connection; unique at any point in time.

 * @return new conn_rec, or NULL if the connection has already been reset

 */

conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 

AP_CORE_DECLARE(conn_rec *)ap_new_connection(apr_pool_t *p, server_rec *server, 

                            apr_socket_t *inout, long id);



/**

modules/http/http_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ AP_DECLARE(int) ap_send_http_trace(request_rec *r) 
    return OK;

}



int ap_send_http_options(request_rec *r)

AP_DECLARE(int) ap_send_http_options(request_rec *r)

{

    if (r->assbackwards)

        return DECLINED;

modules/http/mod_core.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ char *ap_response_code_string(request_rec *r, int error_index); 
AP_DECLARE(void) ap_basic_http_header(request_rec *r, apr_bucket_brigade *bb);

 

AP_DECLARE(int) ap_send_http_trace(request_rec *r);

int ap_send_http_options(request_rec *r);

AP_DECLARE(int) ap_send_http_options(request_rec *r);



#ifdef __cplusplus

}