MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-24 11:59:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add HTTP/1.0 support, primarily for the Roku SoundBridge

Browse Source
This commit is contained in:
Ron Pedde 2004-09-12 22:58:55 +00:00
parent eaa60c3f3c
commit 5463b63436
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/webserver.c
View File

@ -328,13 +328,14 @@ void *ws_mainthread(void *arg) {
if(pthread_mutex_lock(&pwsp->exit_mutex)) if(pthread_mutex_lock(&pwsp->exit_mutex))
DPRINTF(ERR_FATAL,"Cannot lock condition mutex\n"); DPRINTF(ERR_FATAL,"Cannot lock condition mutex\n");
pwsp->dispatch_threads++; /* since ws_close will decrement if fail */
if((err=pthread_create(&tid,NULL,ws_dispatcher,(void*)pwsc))) { if((err=pthread_create(&tid,NULL,ws_dispatcher,(void*)pwsc))) {
pwsc->error=err; pwsc->error=err;
DPRINTF(ERR_WARN,"Could not spawn thread: %s\n",strerror(err)); DPRINTF(ERR_WARN,"Could not spawn thread: %s\n",strerror(err));
pthread_mutex_unlock(&pwsp->exit_mutex); pthread_mutex_unlock(&pwsp->exit_mutex);
ws_close(pwsc); ws_close(pwsc);
} else { } else {
pwsp->dispatch_threads++;
pthread_mutex_unlock(&pwsp->exit_mutex); pthread_mutex_unlock(&pwsp->exit_mutex);
pthread_detach(tid); pthread_detach(tid);
} }
@ -385,6 +386,9 @@ void ws_close(WS_CONNINFO *pwsc) {
DPRINTF(ERR_FATAL,"Error: Bad dispatch thread count!\n"); DPRINTF(ERR_FATAL,"Error: Bad dispatch thread count!\n");
} else { } else {
pwsp->dispatch_threads--; pwsp->dispatch_threads--;
DPRINTF(ERR_INFO,"Thread %d: without me, there are only %d threads left\n",
pwsc->threadno,pwsp->dispatch_threads);
if(pthread_cond_signal(&pwsp->exit_cond)) if(pthread_cond_signal(&pwsp->exit_cond))
DPRINTF(ERR_FATAL,"Error: cannot signal condition\n"); DPRINTF(ERR_FATAL,"Error: cannot signal condition\n");
} }
@ -635,6 +639,7 @@ void *ws_dispatcher(void *arg) {
first=last=buffer; first=last=buffer;
strsep(&last," "); strsep(&last," ");
if(!last) { if(!last) {
pwsc->close=1;
ws_returnerror(pwsc,400,"Bad request\n"); ws_returnerror(pwsc,400,"Bad request\n");
ws_close(pwsc); ws_close(pwsc);
return NULL; return NULL;
@ -647,6 +652,7 @@ void *ws_dispatcher(void *arg) {
} else { } else {
/* return a 501 not implemented */ /* return a 501 not implemented */
pwsc->error=EINVAL; pwsc->error=EINVAL;
pwsc->close=1;
ws_returnerror(pwsc,501,"Not implemented"); ws_returnerror(pwsc,501,"Not implemented");
ws_close(pwsc); ws_close(pwsc);
return NULL; return NULL;
@ -657,10 +663,11 @@ void *ws_dispatcher(void *arg) {
pwsc->uri=strdup(first); pwsc->uri=strdup(first);
/* Get headers */ /* Get headers */
if(ws_getheaders(pwsc)) { if((ws_getheaders(pwsc)) || (!last)) { /* didn't provide a HTTP/1.x */
/* error already set */ /* error already set */
DPRINTF(ERR_FATAL,"Thread %d: Couldn't parse headers - aborting\n", DPRINTF(ERR_FATAL,"Thread %d: Couldn't parse headers - aborting\n",
pwsc->threadno); pwsc->threadno);
pwsc->close=1;
ws_close(pwsc); ws_close(pwsc);
return NULL; return NULL;
} }
@ -669,11 +676,19 @@ void *ws_dispatcher(void *arg) {
/* Now that we have the headers, we can /* Now that we have the headers, we can
* decide whether or not this is a persistant * decide whether or not this is a persistant
* connection */ * connection */
if(strncasecmp(last,"HTTP/1.0",8)==0) { /* defaults to non-persistant */
pwsc->close=!ws_testarg(&pwsc->request_headers,"connection","keep-alive");
} else { /* default to persistant for HTTP/1.1 and above */
pwsc->close=ws_testarg(&pwsc->request_headers,"connection","close");
}
DPRINTF(ERR_DEBUG,"Thread %d: Connection type %s: Connection: %s\n",
pwsc->threadno, last, pwsc->close ? "non-persist" : "persist");
if(!pwsc->uri) { if(!pwsc->uri) {
/* We have memory allocation errors... might just /* We have memory allocation errors... might just
* as well bail */ * as well bail */
pwsc->error=ENOMEM; pwsc->error=ENOMEM;
pwsc->close=1; /* force a full close */
DPRINTF(ERR_FATAL,"Thread %d: Error allocation URI\n", DPRINTF(ERR_FATAL,"Thread %d: Error allocation URI\n",
pwsc->threadno); pwsc->threadno);
ws_returnerror(pwsc,500,"Internal server error"); ws_returnerror(pwsc,500,"Internal server error");
@ -734,9 +749,6 @@ void *ws_dispatcher(void *arg) {
ws_moy[now_tm.tm_mon],now_tm.tm_year + 1900, ws_moy[now_tm.tm_mon],now_tm.tm_year + 1900,
now_tm.tm_hour,now_tm.tm_min,now_tm.tm_sec); now_tm.tm_hour,now_tm.tm_min,now_tm.tm_sec);
pwsc->close=ws_testarg(&pwsc->request_headers,"connection",
"close");
if(hdrs) { if(hdrs) {
ws_addarg(&pwsc->response_headers,"Connection", ws_addarg(&pwsc->response_headers,"Connection",
pwsc->close ? "close" : "keep-alive"); pwsc->close ? "close" : "keep-alive");