The R Project SVN – R – Diff – /branches/R-exp-R5/src/modules/internet/Rhttpd.c

 	    workers[i] = NULL;
     DBG(printf("removing worker %p\n", (void*) c));
     free(c);
+}
+#ifndef Win32
+extern int R_ignore_SIGPIPE; /* defined in src/main/main.c on unix */
+#else
+static int R_ignore_SIGPIPE; /* for simplicity of the code below */
+#endif
 static int send_response(SOCKET s, const char *buf, unsigned int len)
+{
     unsigned int i = 0;
+    /* we have to tell R to ignore SIGPIPE otherwise it can raise an error
+       and get us into deep trouble */
+    R_ignore_SIGPIPE = 1;
     while (i < len) {
 	int n = send(s, buf + i, len - i, 0);
+	if (n < 1) {
+	    R_ignore_SIGPIPE = 0;
-	if (n < 1) return -1;
+	    return -1;
+	}
 	i += n;
+    }
+    R_ignore_SIGPIPE = 0;
     return 0;
+}
 /* sends HTTP/x.x plus the text (which should be of the form " XXX ...") */
 static int send_http_response(httpd_conn_t *c, const char *text) {
     char buf[96];
     const char *s = HTTP_SIG(c);
-    int l = strlen(text);
+    int l = strlen(text), res;
     /* reduce the number of packets by sending the payload en-block from buf */
     if (l < sizeof(buf) - 10) {
 	strcpy(buf, s);
 	strcpy(buf + 8, text);
 	return send_response(c->sock, buf, l + 8);
+    }
+    R_ignore_SIGPIPE = 1;
-    if (send(c->sock, s, 8, 0) < 8) return -1;
+    res = send(c->sock, s, 8, 0);
+    R_ignore_SIGPIPE = 0;
+    if (res < 8) return -1;
     return send_response(c->sock, text, strlen(text));
+}
 /* decode URI in place (decoding never expands) */
 static void uri_decode(char *s)
 		/* move the body part to the beginning of the buffer */
 		c->line_pos -= s - c->line_buf;
 		memmove(c->line_buf, s, c->line_pos);
 		if (c->method != METHOD_POST) { /* anything but POST can be processed right away */
 		    if (c->attr & CONTENT_LENGTH) {
-			send(c->sock, "HTTP/1.0 400 Bad Request (GET/HEAD with body)\r\n\r\n", 49, 0);
+			send_http_response(c, " 400 Bad Request (GET/HEAD with body)\r\n\r\n");
 			remove_worker(c);
 			return;
+		    }
 		    process_request(c);
 		    if (c->attr & CONNECTION_CLOSE) {
 		if (!*s) { /* incomplete line */
 		    if (bol == c->line_buf) {
 			if (c->line_pos < LINE_BUF_SIZE) /* one, incomplete line, but the buffer is not full yet, just return */
 			    return;
 			/* the buffer is full yet the line is incomplete - we're in trouble */
-			send(c->sock, "HTTP/1.0 413 Request entity too large\r\nConnection: close\r\n\r\n", 60, 0);
+			send_http_response(c, " 413 Request entity too large\r\nConnection: close\r\n\r\n");
 			remove_worker(c);
 			return;
+		    }
 		    /* move the line to the begining of the buffer for later requests */
 		    c->line_pos -= bol - c->line_buf;
 		    if (c->part == PART_REQUEST) {
 			/* --- process request line --- */
 			unsigned int rll = strlen(bol); /* request line length */
 			char *url = bol + 5;
 			if (rll < 14 || strncmp(bol + rll - 9, " HTTP/1.", 8)) { /* each request must have at least 14 characters [GET / HTTP/1.0] and have HTTP/1.x */
-			    send(c->sock, "HTTP/1.0 400 Bad Request\r\n\r\n", 28, 0);
+			    send_response(c->sock, "HTTP/1.0 400 Bad Request\r\n\r\n", 28);
 			    remove_worker(c);
 			    return;
+			}
 			if (!strncmp(bol + rll - 3, "1.0", 3)) c->attr |= HTTP_1_0;
 			if (!strncmp(bol, "GET ", 4)) { c->method = METHOD_GET; url--; }
 			if (!strncmp(bol, "POST ", 5)) c->method = METHOD_POST;
 			if (!strncmp(bol, "HEAD ", 5)) c->method = METHOD_HEAD;
 			if (!c->method) {
-			    send(c->sock, "HTTP/1.0 501 Invalid or unimplemented method\r\n\r\n", 48, 0);
+			    send_http_response(c, " 501 Invalid or unimplemented method\r\n\r\n");
 			    remove_worker(c);
 			    return;
+			}
 			bol[strlen(bol) - 9] = 0;
 			c->url = strdup(url);

The R Project SVN R

(root)/branches/R-exp-R5/src/modules/internet/Rhttpd.c @ 63243 – Rev 51653 → 51805