webserver: comparison src/server/daemon/protocol.c

-:032b0ad35ee3
+:7c9137f9e7f9
 return r;
 }
-void add_http_status_line(sbuf_t *out, pool_handle_t *pool, Request *rq) {
+void add_http_status_line(CxBuffer *out, pool_handle_t *pool, Request *rq) {
-sbuf_write(out, "HTTP/1.1 ", 9);
+cxBufferWrite("HTTP/1.1 ", 1, 9, out);
-char *status_code_str = pool_malloc(pool, 8);
+char status_code_str[8];
 int sc_len = snprintf(status_code_str, 8, "%d ", rq->status_num);
-sbuf_write(out, status_code_str, sc_len);
+cxBufferWrite(status_code_str, 1, sc_len, out);
 char *scmsg = pblock_findkeyval(pb_key_status, rq->srvhdrs);
 if(scmsg == NULL) {
 scmsg = "OK";
 }
-sbuf_write(out, scmsg, strlen(scmsg));
+cxBufferWrite(scmsg, 1, strlen(scmsg), out);
-sbuf_write(out, "\r\n", 2);
+cxBufferWrite("\r\n", 1, 2, out);
 }
-void add_http_response_header(sbuf_t *out, Request *rq) {
+void add_http_response_header(CxBuffer *out, Request *rq) {
 pblock   *h = rq->srvhdrs;
 pb_entry *p;
 for(int i=0;i<h->hsize;i++) {
 p = h->ht[i];
 if(name[0] > 90) {
 /*
 * make first char uppercase and write the remaining chars
 * unmodified to the buffer
 */
-sbuf_put(out, name[0]-32);
+cxBufferPut(out, name[0]-32);
 if(name_len > 1) {
-sbuf_write(out, name+1, name_len-1);
+cxBufferWrite(name+1, 1, name_len-1, out);
 }
 } else {
 // first char is already uppercase so just write the name
-sbuf_write(out, name, name_len);
+cxBufferWrite(name, 1, name_len, out);
 }
-sbuf_write(out, ": ", 2);
+cxBufferWrite(": ", 1, 2, out);
-sbuf_write(out, value, strlen(value));
+cxBufferWrite(value, 1, strlen(value), out);
-sbuf_write(out, "\r\n", 2);
+cxBufferWrite("\r\n", 1, 2, out);
 p = p->next;
 }
 }
 }
-int http_start_response(Session *sn, Request *rq) {
+struct HttpResponseWriter {
-Connection *conn = ((NSAPISession*)sn)->connection;
+Session *sn;
+Request *rq;
+CxBuffer buf;
+};
+HttpResponseWriter *http_create_response(Session *sn, Request *rq) {
+HttpResponseWriter *writer = pool_malloc(sn->pool, sizeof(HttpResponseWriter));
+if(!writer) {
+return NULL;
+}
+if(cxBufferInit(&writer->buf, NULL, 512, pool_allocator(sn->pool), CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS)) {
+pool_free(sn->pool, writer);
+return NULL;
+}
+writer->sn = sn;
+writer->rq = rq;
 if(rq->status_num == -1) {
 protocol_status(sn, rq, 200, "OK");
 }
-// set socket blocking
-//int flags;
-//flags = fcntl(fd, F_GETFL, 0);
-//fcntl(fd, F_SETFL, flags ^ O_NONBLOCK);
-// output buffer
-sbuf_t *out = sbuf_new(512);
 // add the http status line to the output buffer
-add_http_status_line(out, sn->pool, rq);
+add_http_status_line(&writer->buf, sn->pool, rq);
 // add date header
 struct tm mtms;
 struct tm *mtm = system_gmtime(&rq->req_start, &mtms);
 char date[HTTP_DATE_LEN + 1];
 strftime(date, HTTP_DATE_LEN, HTTP_DATE_FMT, mtm);
-sbuf_write(out, "Date: ", 6);
+cxBufferWrite("Date: ", 1, 6, &writer->buf);
-sbuf_write(out, date, strlen(date));
+cxBufferWrite(date, 1, strlen(date), &writer->buf);
-sbuf_write(out, "\r\n", 2);
+cxBufferWrite("\r\n", 1, 2, &writer->buf);
 // add server header
-sbuf_write(out, "Server: webserver\r\n", 19);
+cxBufferWrite("Server: webserver\r\n", 1, 19, &writer->buf);
 // check content length ans transfer encoding
 char *ctlen = pblock_findkeyval(pb_key_content_length, rq->srvhdrs);
 char *enc = pblock_findkeyval(pb_key_transfer_encoding, rq->srvhdrs);
 if(ctlen && enc) {
 stream->chunked_enc = 1;
 rq->rq_attr.chunked = 1;
 }
 // add header from rq->srvhdrs
-add_http_response_header(out, rq);
+add_http_response_header(&writer->buf, rq);
 // add connection header
 if(rq->rq_attr.keep_alive) {
-sbuf_write(out, "Connection: keep-alive\r\n", 24);
+cxBufferWrite("Connection: keep-alive\r\n", 1, 24, &writer->buf);
 pblock_kvinsert(pb_key_connection, "keep-alive", 10, rq->srvhdrs);
 } else {
-sbuf_write(out, "Connection: close\r\n", 19);
+cxBufferWrite("Connection: close\r\n", 1, 19, &writer->buf);
 pblock_kvinsert(pb_key_connection, "close", 5, rq->srvhdrs);
 }
 // response header end
-sbuf_write(out, "\r\n", 2);
+cxBufferWrite("\r\n", 1, 2,& writer->buf);
+// reset pos (required for http_start_response_async)
+writer->buf.pos = 0;
+return writer;
+}
+int http_send_response(HttpResponseWriter *writer) {
+Connection *conn = ((NSAPISession*)writer->sn)->connection;
+CxBuffer *buf = &writer->buf;
 // flush buffer to the socket
-conn->write(conn, out->ptr, out->length);
+while(buf->pos < buf->size) {
-sbuf_free(out);
+int w = conn->write(conn, buf->space + buf->pos, buf->size - buf->pos);
+if(w <= 0) {
+if(conn->ssl) {
+if(conn->ssl_error == SSL_ERROR_WANT_WRITE) {
+return 1;
+}
+} else {
+if(errno == EWOULDBLOCK) {
+return 1;
+}
+}
+return -1;
+}
+buf->pos += w;
+}
-rq->senthdrs = 1;
+writer->rq->senthdrs = 1;
+cxBufferDestroy(buf);
+pool_free(writer->sn->pool, writer);
 return 0;
+}
+int http_start_response(Session *sn, Request *rq) {
+HttpResponseWriter *writer = http_create_response(sn, rq);
+if(!writer) {
+return 1;
+}
+return http_send_response(writer);
 }
 int http_send_continue(Session *sn) {
 NSAPISession *s = (NSAPISession*)sn;
 cxstring msg = CX_STR("HTTP/1.1 100 Continue\r\n\r\n");

Mercurial > hg > webserver / file comparison

comparison: src/server/daemon/protocol.c

src/server/daemon/protocol.c