From 0a70ea3e09f36f62651b2a9a83e5b8d1847ad8a6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 23 May 2012 13:12:32 -0500 Subject: [PATCH] scgi updates --- libs/libscgi/src/include/scgi.h | 2 +- libs/libscgi/src/scgi.c | 4 ---- src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/libscgi/src/include/scgi.h b/libs/libscgi/src/include/scgi.h index b6a5165858..575a45f7f9 100644 --- a/libs/libscgi/src/include/scgi.h +++ b/libs/libscgi/src/include/scgi.h @@ -198,7 +198,7 @@ SCGI_DECLARE(scgi_status_t) scgi_bind(const char *host, scgi_port_t port, scgi_s SCGI_DECLARE(scgi_status_t) scgi_accept(scgi_socket_t server_sock, scgi_socket_t *client_sock_p, struct sockaddr_in *echoClntAddr); #ifndef WIN32 -#define closesocket(x) shutdown(x, 2); close(x) +#define closesocket(x) close(x) #endif #ifdef __cplusplus diff --git a/libs/libscgi/src/scgi.c b/libs/libscgi/src/scgi.c index 9f8e9956e0..df05b5980b 100644 --- a/libs/libscgi/src/scgi.c +++ b/libs/libscgi/src/scgi.c @@ -384,10 +384,6 @@ SCGI_DECLARE(scgi_status_t) scgi_disconnect(scgi_handle_t *handle) return SCGI_FAIL; } - if (!handle->sock) { - abort(); - } - if (handle->sock != SCGI_SOCK_INVALID) { closesocket(handle->sock); handle->sock = SCGI_SOCK_INVALID; diff --git a/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c b/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c index 97b6bdcf0a..6ee62d6ac9 100644 --- a/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c +++ b/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c @@ -145,7 +145,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con scgi_disconnect(&handle); - if (len < 0) { + if (len < 0 && (!txt || !strlen(txt))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DEBUG:\nURL: %s Connection Read Failed: [%s]\n", binding->url, handle.err); goto end; }