Several final namespace changes. Exports (with an ap_ prefix!) the

  useful sendwithtimeout/recvwithtimeout symbols.  How useful?  SSL needs
  them, and proxy_connect should probably use them as well.  And corrects
  two newly exported (never released) symbols since they did not require
  the _NONSTD semantics.

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

diff --git a/src/ApacheCore.def b/src/ApacheCore.def
index 684878dfbe07cca1aed79e7223a5cc66097a8f8b..7e05c45e9a37c1bff14166cdab4b3a9c69ea82cc 100644 (file)
--- a/src/ApacheCore.def
+++ b/src/ApacheCore.def
@@ -440,3 +440,5 @@ EXPORTS
         ap_set_callback_and_alarm @432
         ap_set_sub_req_protocol @433
         ap_update_child_status @434
+        ap_sendwithtimeout @435
+        ap_recvwithtimeout @436

diff --git a/src/include/http_main.h b/src/include/http_main.h
index 38edb338dea6a37737a0215c4eff8474e7d849b5..b9593c813c9a632f3c7539ea5144b09be6776b7f 100644 (file)
--- a/src/include/http_main.h
+++ b/src/include/http_main.h
@@ -125,7 +125,7 @@ API_EXPORT(void) ap_child_terminate(request_rec *r);
 API_EXPORT(void) ap_sync_scoreboard_image(void);
 API_EXPORT(int) ap_update_child_status(int child_num, int status, request_rec *r);
 void ap_time_process_request(int child_num, int status);
-API_EXPORT_NONSTD(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x);
+API_EXPORT(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x);
 API_EXPORT(int) ap_check_alarm(void);
 
 void setup_signal_names(char *prefix);

diff --git a/src/include/http_vhost.h b/src/include/http_vhost.h
index 60618963d6355b6867fc0a8c0ec9c4399d3f72eb..87f5ace62abec6e7808aa3d8e173572b1f425e94 100644 (file)
--- a/src/include/http_vhost.h
+++ b/src/include/http_vhost.h
@@ -73,7 +73,7 @@ API_EXPORT(void) ap_fini_vhost_config(pool *p, server_rec *main_server);
 API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname, server_rec *s);
 
 /* handle NameVirtualHost directive */
-API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
+API_EXPORT(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg);
 
 /* given an ip address only, give our best guess as to what vhost it is */
 API_EXPORT(void) ap_update_vhost_given_ip(conn_rec *conn);

diff --git a/src/main/buff.c b/src/main/buff.c
index 55346597c68f32109af7ce619263fd6be5c4ca3a..8c5fdc2a9558721d31d7c76caa86393389bcb765 100644 (file)
--- a/src/main/buff.c
+++ b/src/main/buff.c
@@ -128,7 +128,7 @@
   select() sometimes returns 1 even though the write will block. We must work around this.
 */
 
-int sendwithtimeout(int sock, const char *buf, int len, int flags)
+API_EXPORT(int) ap_sendwithtimeout(int sock, const char *buf, int len, int flags)
 {
     int iostate = 1;
     fd_set fdset;
@@ -195,7 +195,7 @@ int sendwithtimeout(int sock, const char *buf, int len, int flags)
 }
 
 
-int recvwithtimeout(int sock, char *buf, int len, int flags)
+API_EXPORT(int) ap_recvwithtimeout(int sock, char *buf, int len, int flags)
 {
     int iostate = 1;
     fd_set fdset;
@@ -284,7 +284,7 @@ static ap_inline int buff_read(BUFF *fb, void *buf, int nbyte)
 
 #if defined (WIN32) || defined(NETWARE) || defined(CYGWIN_WINSOCK) 
     if (fb->flags & B_SOCKET) {
-       rv = recvwithtimeout(fb->fd_in, buf, nbyte, 0);
+       rv = ap_recvwithtimeout(fb->fd_in, buf, nbyte, 0);
        if (rv == SOCKET_ERROR)
            errno = WSAGetLastError();
     }
@@ -361,7 +361,7 @@ static ap_inline int buff_write(BUFF *fb, const void *buf, int nbyte)
    
 #if defined(WIN32) || defined(NETWARE)
     if (fb->flags & B_SOCKET) {
-       rv = sendwithtimeout(fb->fd, buf, nbyte, 0);
+       rv = ap_sendwithtimeout(fb->fd, buf, nbyte, 0);
        if (rv == SOCKET_ERROR)
            errno = WSAGetLastError();
     }

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 23cac62f2dcd2309b42c6df984db49f3a9e8b044..e491c86b7cf27a463c48b880efb9d301cebb9f01 100644 (file)
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -1582,7 +1582,7 @@ static void alrm_handler(int sig)
 }
 #endif
 
-API_EXPORT_NONSTD(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x)
+API_EXPORT(unsigned int) ap_set_callback_and_alarm(void (*fn) (int), int x)
 {
     unsigned int old;
 

diff --git a/src/main/http_vhost.c b/src/main/http_vhost.c
index 9947e8d8adb9c637fdece766fb93370843650fcf..a35d83e76da2d47dc8b5fee5a9bff661b3bdd6d9 100644 (file)
--- a/src/main/http_vhost.c
+++ b/src/main/http_vhost.c
@@ -268,7 +268,7 @@ API_EXPORT(const char *) ap_parse_vhost_addrs(pool *p, const char *hostname, ser
 }
 
 
-API_EXPORT_NONSTD(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg)
+API_EXPORT(const char *) ap_set_name_virtual_host (cmd_parms *cmd, void *dummy, char *arg)
 {
     /* use whatever port the main server has at this point */
     return get_addresses(cmd->pool, arg, &name_vhost_list_tail,

diff --git a/src/os/netware/ApacheCore.imp b/src/os/netware/ApacheCore.imp
index 9fbbb9b01bc6c4185040390f19bb30d2346fb288..5458f7d082e04184fd0fcfe9391659f25b947540 100644 (file)
--- a/src/os/netware/ApacheCore.imp
+++ b/src/os/netware/ApacheCore.imp
@@ -415,3 +415,5 @@
  ap_set_callback_and_alarm,
  ap_set_sub_req_protocol,
  ap_update_child_status,
+ ap_sendwithtimeout,
+ ap_recvwithtimeout,