X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftcp_sockets.c;h=e45231f56a3dd21eba074192ca3facc0d4012ae8;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=da483deabceab4b9c1f0162169495d69411b738b;hpb=77d93a35c3508e8f06d3327a742fd5471849a1b2;p=citadel.git

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index da483deab..e45231f56 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -1,19 +1,13 @@
 /*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
+ * it under the terms of the GNU General Public License, version 3.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -21,11 +15,9 @@
 #define SERV_TRACE 1
  */
 
-
 #include "webcit.h"
 #include "webserver.h"
 
-extern int DisableGzip;
 long MaxRead = -1; /* should we do READ scattered or all at once? */
 
 /*
@@ -173,6 +165,9 @@ int StrBuf_ServGetln(StrBuf *buf)
 	const char *ErrStr = NULL;
 	int rc;
 	
+	if (!WCC->connected)
+		return -1;
+
 	FlushStrBuf(buf);
 	rc = StrBufTCP_read_buffered_line_fast(buf, 
 					       WCC->ReadBuf, 
@@ -448,7 +443,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
 
 	if (is_https) {
 		int ntries = 0;
-		if (StrLength(Hdr->ReadBuf) > 0) {
+		if (StrLength(Hdr->ReadBuf) > 0)
+		{
 			pchs = ChrPtr(Hdr->ReadBuf);
 			pch = strchr(pchs, '\n');
 			if (pch != NULL) {
@@ -471,6 +467,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
 					retval = client_read_sslbuffer(Hdr->ReadBuf, SLEEPING);
 					pchs = ChrPtr(Hdr->ReadBuf);
 					pch = strchr(pchs, '\n');
+					if (pch == NULL)
+						retval = 0;
 				}
 				if (retval == 0) {
 					sleeeeeeeeeep(1);
@@ -690,11 +688,6 @@ int client_read_to(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout)
 				retval = client_read_sslbuffer(Hdr->ReadBuf, timeout);
 			if (retval >= 0) {
 				StrBufAppendBuf(Target, Hdr->ReadBuf, 0); /* todo: Buf > bytes? */
-#ifdef HTTP_TRACING
-				write(2, "\033[32m", 5);
-				write(2, buf, bytes);
-				write(2, "\033[30m", 5);
-#endif
 				return 1;
 			}
 			else {
@@ -722,11 +715,6 @@ int client_read_to(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout)
 		return retval;
 	}
 
-#ifdef HTTP_TRACING
-	write(2, "\033[32m", 5);
-	write(2, buf, bytes);
-	write(2, "\033[30m", 5);
-#endif
 	return 1;
 }
 
@@ -785,13 +773,6 @@ long end_burst(void)
 	}
 #endif
 
-	
-#ifdef HTTP_TRACING
-	
-	write(2, "\033[34m", 5);
-	write(2, ptr, StrLength(WCC->WBuf));
-	write(2, "\033[30m", 5);
-#endif
 	if (WCC->Hdr->http_sock == -1)
 		return -1;
 	fdflags = fcntl(WC->Hdr->http_sock, F_GETFL);
@@ -822,13 +803,6 @@ long end_burst(void)
 	count = StrLength(WCC->WBuf);
 	eptr = ptr + count;
 
-#ifdef HTTP_TRACING
-	
-	write(2, "\033[34m", 5);
-	write(2, ptr, StrLength(WCC->WBuf));
-	write(2, "\033[30m", 5);
-#endif
-
         while ((ptr < eptr) && (WCC->Hdr->http_sock != -1)) {
                 if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
                         FD_ZERO(&wset);
@@ -933,10 +907,12 @@ SessionDestroyModule_TCPSOCKETS
 {
 	FreeStrBuf(&sess->CLineBuf);
 	FreeStrBuf(&sess->ReadBuf);
+	sess->connected = 0;
 	sess->ReadPos = NULL;
 	FreeStrBuf(&sess->MigrateReadLineBuf);
 	if (sess->serv_sock > 0) {
 		syslog(LOG_DEBUG, "Closing socket %d", sess->serv_sock);
 		close(sess->serv_sock);
 	}
+	sess->serv_sock = -1;
 }