/*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2017 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, version 3.
pche = pch + len;
if (WCC->ReadPos != pche)
{
- syslog(LOG_EMERG,
+ syslog(LOG_ERR,
"ERROR: somebody didn't eat his soup! Remaing Chars: %ld [%s]\n",
(long)(pche - WCC->ReadPos),
pche
);
- syslog(LOG_EMERG,
+ syslog(LOG_ERR,
"--------------------------------------------------------------------------------\n"
"Whole buf: [%s]\n"
"--------------------------------------------------------------------------------\n",
int client_con_state = 0;
int chunked = 0;
int is_gzip = 0;
+ const char *Err = NULL;
StrBuf *BufHeader = NULL;
StrBuf *Buf;
StrBuf *pBuf = NULL;
- void *SC = NULL;
+ vStreamT *SC = NULL;
IOBuffer ReadBuffer;
IOBuffer WriteBuffer;
if (chunked)
{
- BufHeader=NewStrBuf();
+ BufHeader = NewStrBuf();
}
if ((detect_mime != 0) && (bytes_read != 0))
if (ServerRc != 6)
{
+ FreeStrBuf(&BufHeader);
FreeStrBuf(&Buf);
return;
}
CT = GuessMimeType(SKEY(WCC->WBuf));
FlushStrBuf(WCC->WBuf);
StrBufPlain(MimeType, CT, -1);
+ CheckGZipCompressionAllowed(SKEY(MimeType));
detect_mime = 0;
FreeStrBuf(&Buf);
}
+ memset(&WriteBuffer, 0, sizeof(IOBuffer));
if (chunked && !DisableGzip && WCC->Hdr->HR.gzip_ok)
{
is_gzip = 1;
- SC = StrBufNewStreamContext (eZLibEncode);
+ SC = StrBufNewStreamContext (eZLibEncode, &Err);
+ if (SC == NULL) {
+ syslog(LOG_ERR, "Error while initializing stream context: %s", Err);
+ FreeStrBuf(&Buf);
+ return;
+ }
memset(&ReadBuffer, 0, sizeof(IOBuffer));
ReadBuffer.Buf = WCC->WBuf;
- memset(&WriteBuffer, 0, sizeof(IOBuffer));
WriteBuffer.Buf = NewStrBufPlain(NULL, SIZ*2);;
+ pBuf = WriteBuffer.Buf;
}
else
{
if (send_http(WCC->HBuf) < 0)
{
FreeStrBuf(&Buf);
+ FreeStrBuf(&WriteBuffer.Buf);
+ FreeStrBuf(&BufHeader);
+ if (StrBufDestroyStreamContext(eZLibEncode, &SC, &Err) && Err) {
+ syslog(LOG_ERR, "Error while destroying stream context: %s", Err);
+ }
return;
}
}
if (WCC->serv_sock==-1) {
FlushStrBuf(WCC->WBuf);
FreeStrBuf(&Buf);
+ FreeStrBuf(&WriteBuffer.Buf);
+ FreeStrBuf(&BufHeader);
+ StrBufDestroyStreamContext(eZLibEncode, &SC, &Err);
+ if (StrBufDestroyStreamContext(eZLibEncode, &SC, &Err) && Err) {
+ syslog(LOG_ERR, "Error while destroying stream context: %s", Err);
+ }
return;
}
CT = GuessMimeType(SKEY(WCC->WBuf));
StrBufPlain(MimeType, CT, -1);
+ if (is_gzip) {
+ CheckGZipCompressionAllowed(SKEY(MimeType));
+ is_gzip = WCC->Hdr->HR.gzip_ok;
+ }
http_transmit_headers(ChrPtr(MimeType), is_static, chunked, is_gzip);
client_con_state = send_http(WCC->HBuf);
{
int done = (bytes_read == total_len);
while ((IOBufferStrLength(&ReadBuffer) > 0) && (client_con_state == 0)) {
- StrBufStreamTranscode(eZLibEncode, &WriteBuffer, &ReadBuffer, NULL, -1, SC, done);
-
- StrBufPrintf(BufHeader, "%s%x\r\n",
- (first)?"":"\r\n",
- StrLength (pBuf));
- first = 0;
- client_con_state = send_http(BufHeader);
- if (client_con_state == 0) {
- client_con_state = send_http(pBuf);
- }
+ int rc;
+
+ do {
+ rc = StrBufStreamTranscode(eZLibEncode, &WriteBuffer, &ReadBuffer, NULL, -1, SC, done, &Err);
+
+ if (StrLength (pBuf) > 0) {
+ StrBufPrintf(BufHeader, "%s%x\r\n",
+ (first)?"":"\r\n",
+ StrLength (pBuf));
+ first = 0;
+ client_con_state = send_http(BufHeader);
+ if (client_con_state == 0) {
+ client_con_state = send_http(pBuf);
+ }
+ FlushStrBuf(pBuf);
+ }
+ } while ((rc == 1) && (StrLength(pBuf) > 0));
}
FlushStrBuf(WCC->WBuf);
}
}
}
+ if (SC && StrBufDestroyStreamContext(eZLibEncode, &SC, &Err) && Err) {
+ syslog(LOG_ERR, "Error while destroying stream context: %s", Err);
+ }
+ FreeStrBuf(&WriteBuffer.Buf);
if ((chunked) && (client_con_state == 0))
{
StrBufPlain(BufHeader, HKEY("\r\n0\r\n\r\n"));
if (send_http(BufHeader) < 0)
{
FreeStrBuf(&Buf);
+ FreeStrBuf(&BufHeader);
return;
}
}
+ FreeStrBuf(&BufHeader);
FreeStrBuf(&Buf);
}
}
if (b < 0) {
- syslog(LOG_EMERG, "Can't bind: %s\n", strerror(errno));
+ syslog(LOG_ERR, "Can't bind: %s\n", strerror(errno));
close(s);
return (-WC_EXIT_BIND);
}
if (listen(s, queue_len) < 0) {
- syslog(LOG_EMERG, "Can't listen: %s\n", strerror(errno));
+ syslog(LOG_ERR, "Can't listen: %s\n", strerror(errno));
close(s);
return (-WC_EXIT_BIND);
}
* sockpath - file name of the unix domain socket
* queue_len - Number of incoming connections to allow in the queue
*/
-int webcit_uds_server(char *sockpath, int queue_len)
-{
+int webcit_uds_server(char *sockpath, int queue_len) {
struct sockaddr_un addr;
int s;
int i;
}
-
-
/*
* Read data from the client socket.
*
* 0 Request timed out.
* -1 Connection is broken, or other error.
*/
-int client_read_to(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout)
-{
+int client_read_to(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout) {
const char *Error;
int retval = 0;
baselen = StrLength(Target);
- if (Hdr->Pos == NULL)
+ if (Hdr->Pos == NULL) {
Hdr->Pos = ChrPtr(Hdr->ReadBuf);
+ }
- if (StrLength(Hdr->ReadBuf) > 0)
- {
+ if (StrLength(Hdr->ReadBuf) > 0) {
bufremain = StrLength(Hdr->ReadBuf) - (Hdr->Pos - ChrPtr(Hdr->ReadBuf));
if (bytes < bufremain)
StrBufCutLeft(Hdr->ReadBuf, bufremain);
}
- if (bytes > bufremain)
- {
+ if (bytes > bufremain) {
while ((StrLength(Hdr->ReadBuf) + StrLength(Target) < bytes + baselen) &&
(retval >= 0))
retval = client_read_sslbuffer(Hdr->ReadBuf, timeout);
O_TERM,
&Error);
if (retval < 0) {
- syslog(LOG_INFO, "client_read() failed: %s\n",
- Error);
+ syslog(LOG_INFO, "client_read() failed: %s\n", Error);
wc_backtrace(LOG_DEBUG);
return retval;
}
}
#endif
- if (WCC->Hdr->http_sock == -1)
+ if (WCC->Hdr->http_sock == -1) {
return -1;
+ }
fdflags = fcntl(WC->Hdr->http_sock, F_GETFL);
- while ((ptr < eptr) && (WCC->Hdr->http_sock != -1)){
+ while ((ptr < eptr) && (WCC->Hdr->http_sock != -1)) {
if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
FD_ZERO(&wset);
FD_SET(WCC->Hdr->http_sock, &wset);
projects / citadel.git / blobdiff