Oh, so the list does not accept attachments. Bummer. Here are the
patches inline.
This one is for webapp. I will send the apr patch in a separate
message.
-walter
*** webapp/lib/pr_warp_network.c.orig Tue Feb 24 02:59:09 2004
--- webapp/lib/pr_warp_network.c Mon Mar 29 10:29:52 2004
***************
*** 28,34 ****
p_reset(pack);
len=3;
while(1) {
! if (apr_recv(sock,&hdr[ptr],&len)!=APR_SUCCESS) {
wa_debug(WA_MARK,"Cannot receive header");
return(wa_false);
}
--- 28,34 ----
p_reset(pack);
len=3;
while(1) {
! if (apr_socket_recv(sock,&hdr[ptr],&len)!=APR_SUCCESS) {
wa_debug(WA_MARK,"Cannot receive header");
return(wa_false);
}
***************
*** 44,50 ****
len=pack->size;
ptr=0;
while(1) {
! if (apr_recv(sock,&pack->buff[ptr],&len)!=APR_SUCCESS) {
wa_debug(WA_MARK,"Cannot receive payload");
return(wa_false);
}
--- 44,50 ----
len=pack->size;
ptr=0;
while(1) {
! if (apr_socket_recv(sock,&pack->buff[ptr],&len)!=APR_SUCCESS) {
wa_debug(WA_MARK,"Cannot receive payload");
return(wa_false);
}
***************
*** 73,79 ****
len=3;
while(1) {
! if (apr_send(sock,&hdr[ptr],&len)!=APR_SUCCESS) return(wa_false);
ptr+=len;
len=3-ptr;
if (len==0) break;
--- 73,79 ----
len=3;
while(1) {
! if (apr_socket_send(sock,&hdr[ptr],&len)!=APR_SUCCESS) return(wa_false);
ptr+=len;
len=3-ptr;
if (len==0) break;
***************
*** 82,88 ****
len=pack->size;
ptr=0;
while(1) {
! if (apr_send(sock,&pack->buff[ptr],&len)!=APR_SUCCESS)
return(wa_false);
ptr+=len;
len=pack->size-ptr;
--- 82,88 ----
len=pack->size;
ptr=0;
while(1) {
! if (apr_socket_send(sock,&pack->buff[ptr],&len)!=APR_SUCCESS)
return(wa_false);
ptr+=len;
len=pack->size-ptr;
***************
*** 102,108 ****
apr_status_t ret=APR_SUCCESS;
apr_socket_t *sock=NULL;
! ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,wa_pool);
if (ret!=APR_SUCCESS) {
sock=NULL;
wa_log(WA_MARK,"Cannot create socket for conn. \"%s\"",conn->name);
--- 102,108 ----
apr_status_t ret=APR_SUCCESS;
apr_socket_t *sock=NULL;
! ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,IPPROTO_TCP,wa_pool);
if (ret!=APR_SUCCESS) {
sock=NULL;
wa_log(WA_MARK,"Cannot create socket for conn. \"%s\"",conn->name);
***************
*** 110,118 ****
}
/* Attempt to connect to the remote endpoint */
! ret=apr_connect(sock, conf->addr);
if (ret!=APR_SUCCESS) {
! apr_shutdown(sock,APR_SHUTDOWN_READWRITE);
sock=NULL;
wa_log(WA_MARK,"Connection \"%s\" cannot connect",conn->name);
return(sock);
--- 110,118 ----
}
/* Attempt to connect to the remote endpoint */
! ret=apr_socket_connect(sock, conf->addr);
if (ret!=APR_SUCCESS) {
! apr_socket_shutdown(sock,APR_SHUTDOWN_READWRITE);
sock=NULL;
wa_log(WA_MARK,"Connection \"%s\" cannot connect",conn->name);
return(sock);
***************
*** 138,144 ****
if (sock==NULL) return;
/* Shutdown and close the socket (ignoring errors) */
! ret=apr_shutdown(sock,APR_SHUTDOWN_READWRITE);
if (ret!=APR_SUCCESS)
wa_log(WA_MARK,"Cannot shutdown \"%s\"",conn->name);
ret=apr_socket_close(sock);
--- 138,144 ----
if (sock==NULL) return;
/* Shutdown and close the socket (ignoring errors) */
! ret=apr_socket_shutdown(sock,APR_SHUTDOWN_READWRITE);
if (ret!=APR_SUCCESS)
wa_log(WA_MARK,"Cannot shutdown \"%s\"",conn->name);
ret=apr_socket_close(sock);
*** webapp/lib/pr_warp_socketpool.c.orig Tue Feb 24 02:59:09 2004
--- webapp/lib/pr_warp_socketpool.c Mon Mar 29 14:07:15 2004
***************
*** 88,94 ****
sock = (apr_socket_t*) elem->curr;
if (sock != NULL) {
! ret = apr_shutdown(sock, APR_SHUTDOWN_READWRITE);
ret = apr_socket_close(sock);
}
--- 88,94 ----
sock = (apr_socket_t*) elem->curr;
if (sock != NULL) {
! ret = apr_socket_shutdown(sock, APR_SHUTDOWN_READWRITE);
ret = apr_socket_close(sock);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
