You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/01/20 23:45:15 UTC
cvs commit: apache-1.3/src/os/netware ApacheCore.imp
wrowe 02/01/20 14:45:15
Modified: src ApacheCore.def
src/include http_main.h http_vhost.h
src/main buff.c http_main.c http_vhost.c
src/os/netware ApacheCore.imp
Log:
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.
Revision Changes Path
1.30 +2 -0 apache-1.3/src/ApacheCore.def
Index: ApacheCore.def
===================================================================
RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApacheCore.def 28 Dec 2001 05:03:06 -0000 1.29
+++ ApacheCore.def 20 Jan 2002 22:45:14 -0000 1.30
@@ -440,3 +440,5 @@
ap_set_callback_and_alarm @432
ap_set_sub_req_protocol @433
ap_update_child_status @434
+ ap_sendwithtimeout @435
+ ap_recvwithtimeout @436
1.39 +1 -1 apache-1.3/src/include/http_main.h
Index: http_main.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_main.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- http_main.h 28 Dec 2001 05:03:06 -0000 1.38
+++ http_main.h 20 Jan 2002 22:45:14 -0000 1.39
@@ -125,7 +125,7 @@
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);
1.15 +1 -1 apache-1.3/src/include/http_vhost.h
Index: http_vhost.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_vhost.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_vhost.h 28 Dec 2001 05:03:06 -0000 1.14
+++ http_vhost.h 20 Jan 2002 22:45:14 -0000 1.15
@@ -73,7 +73,7 @@
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);
1.106 +4 -4 apache-1.3/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- buff.c 17 Jan 2002 13:20:51 -0000 1.105
+++ buff.c 20 Jan 2002 22:45:14 -0000 1.106
@@ -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 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 @@
#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 @@
#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();
}
1.572 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- http_main.c 17 Jan 2002 21:21:09 -0000 1.571
+++ http_main.c 20 Jan 2002 22:45:14 -0000 1.572
@@ -1582,7 +1582,7 @@
}
#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;
1.32 +1 -1 apache-1.3/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_vhost.c 28 Dec 2001 05:03:07 -0000 1.31
+++ http_vhost.c 20 Jan 2002 22:45:14 -0000 1.32
@@ -268,7 +268,7 @@
}
-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,
1.12 +2 -0 apache-1.3/src/os/netware/ApacheCore.imp
Index: ApacheCore.imp
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/netware/ApacheCore.imp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApacheCore.imp 2 Jan 2002 22:47:13 -0000 1.11
+++ ApacheCore.imp 20 Jan 2002 22:45:14 -0000 1.12
@@ -415,3 +415,5 @@
ap_set_callback_and_alarm,
ap_set_sub_req_protocol,
ap_update_child_status,
+ ap_sendwithtimeout,
+ ap_recvwithtimeout,
Re: cvs commit: apache-1.3/src/os/netware ApacheCore.imp
Posted by "William A. Rowe, Jr." <wr...@covalent.net>.
Assuming nobody has issues with this handful of issues, I believe I'm +1 on
tagging 1.3.23. The only holdup I know of is the probable bug in proxy_connect
on win32. If someone hacked that to use ap_send{recv}withtimeout, life would
probably be peachy.
Binary compatibility is now resolved and a dead issue.
Bill
> wrowe 02/01/20 14:45:15
>
> Modified: src ApacheCore.def
> src/include http_main.h http_vhost.h
> src/main buff.c http_main.c http_vhost.c
> src/os/netware ApacheCore.imp
> Log:
> 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.
>
> --- ApacheCore.def 28 Dec 2001 05:03:06 -0000 1.29
> +++ ApacheCore.def 20 Jan 2002 22:45:14 -0000 1.30
> + ap_sendwithtimeout @435
> + ap_recvwithtimeout @436
>
>
> --- http_main.h 28 Dec 2001 05:03:06 -0000 1.38
> +++ http_main.h 20 Jan 2002 22:45:14 -0000 1.39
> -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);
>
>
> --- http_vhost.h 28 Dec 2001 05:03:06 -0000 1.14
> +++ http_vhost.h 20 Jan 2002 22:45:14 -0000 1.15
> -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);
>
>
> --- buff.c 17 Jan 2002 13:20:51 -0000 1.105
> +++ buff.c 20 Jan 2002 22:45:14 -0000 1.106
> -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 recvwithtimeout(int sock, char *buf, int len, int flags)
> +API_EXPORT(int) ap_recvwithtimeout(int sock, char *buf, int len, int flags)
>
>
> --- ApacheCore.imp 2 Jan 2002 22:47:13 -0000 1.11
> +++ ApacheCore.imp 20 Jan 2002 22:45:14 -0000 1.12
> @@ -415,3 +415,5 @@
> ap_set_callback_and_alarm,
> ap_set_sub_req_protocol,
> ap_update_child_status,
> + ap_sendwithtimeout,
> + ap_recvwithtimeout,
Re: cvs commit: apache-1.3/src/os/netware ApacheCore.imp
Posted by "William A. Rowe, Jr." <wr...@covalent.net>.
Assuming nobody has issues with this handful of issues, I believe I'm +1 on
tagging 1.3.23. The only holdup I know of is the probable bug in proxy_connect
on win32. If someone hacked that to use ap_send{recv}withtimeout, life would
probably be peachy.
Binary compatibility is now resolved and a dead issue.
Bill
> wrowe 02/01/20 14:45:15
>
> Modified: src ApacheCore.def
> src/include http_main.h http_vhost.h
> src/main buff.c http_main.c http_vhost.c
> src/os/netware ApacheCore.imp
> Log:
> 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.
>
> --- ApacheCore.def 28 Dec 2001 05:03:06 -0000 1.29
> +++ ApacheCore.def 20 Jan 2002 22:45:14 -0000 1.30
> + ap_sendwithtimeout @435
> + ap_recvwithtimeout @436
>
>
> --- http_main.h 28 Dec 2001 05:03:06 -0000 1.38
> +++ http_main.h 20 Jan 2002 22:45:14 -0000 1.39
> -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);
>
>
> --- http_vhost.h 28 Dec 2001 05:03:06 -0000 1.14
> +++ http_vhost.h 20 Jan 2002 22:45:14 -0000 1.15
> -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);
>
>
> --- buff.c 17 Jan 2002 13:20:51 -0000 1.105
> +++ buff.c 20 Jan 2002 22:45:14 -0000 1.106
> -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 recvwithtimeout(int sock, char *buf, int len, int flags)
> +API_EXPORT(int) ap_recvwithtimeout(int sock, char *buf, int len, int flags)
>
>
> --- ApacheCore.imp 2 Jan 2002 22:47:13 -0000 1.11
> +++ ApacheCore.imp 20 Jan 2002 22:45:14 -0000 1.12
> @@ -415,3 +415,5 @@
> ap_set_callback_and_alarm,
> ap_set_sub_req_protocol,
> ap_update_child_status,
> + ap_sendwithtimeout,
> + ap_recvwithtimeout,