You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ch...@apache.org on 2001/05/11 06:35:43 UTC
cvs commit: httpd-2.0/server config.c connection.c
chuck 01/05/10 21:35:43
Modified: . CHANGES
include http_config.h http_connection.h
modules/http http_protocol.c mod_core.h
server config.c connection.c
Log:
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 <Ia...@cnet.com>
Reviewed by: Chuck murcko
Revision Changes Path
1.193 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- CHANGES 2001/05/02 16:58:15 1.192
+++ CHANGES 2001/05/11 04:35:28 1.193
@@ -1,5 +1,9 @@
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 <Ia...@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]
1.78 +1 -1 httpd-2.0/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- http_config.h 2001/04/30 06:04:33 1.77
+++ http_config.h 2001/05/11 04:35:31 1.78
@@ -840,7 +840,7 @@
* @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
1.36 +1 -1 httpd-2.0/include/http_connection.h
Index: http_connection.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_connection.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- http_connection.h 2001/03/04 06:27:27 1.35
+++ http_connection.h 2001/05/11 04:35:32 1.36
@@ -75,7 +75,7 @@
* @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);
/**
1.320 +1 -1 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- http_protocol.c 2001/05/06 23:27:12 1.319
+++ http_protocol.c 2001/05/11 04:35:35 1.320
@@ -961,7 +961,7 @@
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;
1.13 +1 -1 httpd-2.0/modules/http/mod_core.h
Index: mod_core.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/mod_core.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_core.h 2001/05/06 23:27:12 1.12
+++ mod_core.h 2001/05/11 04:35:36 1.13
@@ -92,7 +92,7 @@
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
}
1.127 +1 -1 httpd-2.0/server/config.c
Index: config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/config.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- config.c 2001/04/20 19:11:21 1.126
+++ config.c 2001/05/11 04:35:39 1.127
@@ -251,7 +251,7 @@
}
}
-ap_conf_vector_t *ap_create_request_config(apr_pool_t *p)
+AP_CORE_DECLARE(ap_conf_vector_t *)ap_create_request_config(apr_pool_t *p)
{
return create_empty_config(p);
}
1.82 +1 -1 httpd-2.0/server/connection.c
Index: connection.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/connection.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- connection.c 2001/03/04 06:27:27 1.81
+++ connection.c 2001/05/11 04:35:41 1.82
@@ -221,7 +221,7 @@
structure, but for now...
*/
-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)
{
conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));