hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disabled chunking in directory listing regardless of keep-alive if http version is 1.0 or earlier

Browse Source
This commit is contained in:
hyung-hwan 2014-10-24 07:25:31 +00:00
parent d207120933
commit 1f47f89062
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qse/lib/http/httpd-dir.c
View File

@ -33,7 +33,7 @@ struct task_dir_t
qse_http_version_t version; qse_http_version_t version;
int keepalive; int keepalive;
int method; int method;
qse_httpd_hnd_t handle; qse_httpd_hnd_t handle;
}; };
typedef struct task_dseg_t task_dseg_t; typedef struct task_dseg_t task_dseg_t;
@ -42,7 +42,7 @@ struct task_dseg_t
qse_http_version_t version; qse_http_version_t version;
int keepalive; int keepalive;
int chunked; int chunked;
qse_mcstr_t path; qse_mcstr_t path;
qse_mcstr_t qpath; qse_mcstr_t qpath;
qse_mcstr_t head; qse_mcstr_t head;
@ -515,9 +515,21 @@ static QSE_INLINE int task_main_getdir (
} }
else else
{ {
int keepalive_ignored = 0;
if (dir->keepalive && (dir->version.major < 1 || (dir->version.major == 1 && dir->version.minor <= 0)))
{
/* this task does chunking when keepalive is set.
* chunking is not supported for http 1.0 or earlier.
* force switch to the close mode */
dir->keepalive = 0;
keepalive_ignored = 1;
}
x = qse_httpd_entaskformat ( x = qse_httpd_entaskformat (
httpd, client, x, httpd, client, x,
QSE_MT("HTTP/%d.%d 200 OK\r\nServer: %s\r\nDate: %s\r\nConnection: %s\r\nContent-Type: text/html\r\n%s\r\n"), QSE_MT("HTTP/%d.%d 200 OK\r\nServer: %s\r\nDate: %s\r\nConnection: %s\r\nContent-Type: text/html\r\n%s\r\n"),
dir->version.major, dir->version.minor, dir->version.major, dir->version.minor,
qse_httpd_getname (httpd), qse_httpd_getname (httpd),
qse_httpd_fmtgmtimetobb (httpd, QSE_NULL, 0), qse_httpd_fmtgmtimetobb (httpd, QSE_NULL, 0),
@ -543,7 +555,10 @@ static QSE_INLINE int task_main_getdir (
/* arrange to send the actual directory contents */ /* arrange to send the actual directory contents */
x = entask_directory_segment (httpd, client, x, dir->handle, dir); x = entask_directory_segment (httpd, client, x, dir->handle, dir);
if (keepalive_ignored && x)
x = qse_httpd_entaskdisconnect (httpd, client, x);
if (x) return 0; if (x) return 0;
} }
httpd->opt.scb.dir.close (httpd, dir->handle); httpd->opt.scb.dir.close (httpd, dir->handle);
@ -602,7 +617,7 @@ qse_httpd_task_t* qse_httpd_entaskdir (
data.foot.ptr = dir->foot? dir->foot: qse_httpd_getname(httpd); data.foot.ptr = dir->foot? dir->foot: qse_httpd_getname(httpd);
data.foot.len = qse_mbslen(data.foot.ptr); data.foot.len = qse_mbslen(data.foot.ptr);
data.version = *qse_htre_getversion(req); data.version = *qse_htre_getversion(req);
data.keepalive = (req->flags & QSE_HTRE_ATTR_KEEPALIVE); data.keepalive = req->flags & QSE_HTRE_ATTR_KEEPALIVE;
data.method = method; data.method = method;
QSE_MEMSET (&task, 0, QSE_SIZEOF(task)); QSE_MEMSET (&task, 0, QSE_SIZEOF(task));
@ -620,7 +635,7 @@ qse_httpd_task_t* qse_httpd_entaskdir (
return x; return x;
} }
} }
case QSE_HTTP_PUT: case QSE_HTTP_PUT:
{ {
int status = 201; /* 201 Created */ int status = 201; /* 201 Created */
@ -642,7 +657,7 @@ qse_httpd_task_t* qse_httpd_entaskdir (
(httpd->errnum == QSE_HTTPD_EACCES)? 403: 500; (httpd->errnum == QSE_HTTPD_EACCES)? 403: 500;
} }
} }
return qse_httpd_entaskerror (httpd, client, pred, status, req); return qse_httpd_entaskerror (httpd, client, pred, status, req);
} }

2
qse/lib/http/httpd-file.c
View File

@ -201,7 +201,6 @@ static QSE_INLINE int task_main_getfile (
if (httpd->opt.scb.file.ropen (httpd, file->path.ptr, &handle) <= -1) if (httpd->opt.scb.file.ropen (httpd, file->path.ptr, &handle) <= -1)
{ {
int http_errnum; int http_errnum;
printf ("ropen failure...\n");
http_errnum = (httpd->errnum == QSE_HTTPD_ENOENT)? 404: http_errnum = (httpd->errnum == QSE_HTTPD_ENOENT)? 404:
(httpd->errnum == QSE_HTTPD_EACCES)? 403: 500; (httpd->errnum == QSE_HTTPD_EACCES)? 403: 500;
x = qse_httpd_entask_error ( x = qse_httpd_entask_error (
@ -211,7 +210,6 @@ printf ("ropen failure...\n");
} }
fileopen = 1; fileopen = 1;
printf ("ropen ok...\n");
if (file->u.get.range.type != QSE_HTTP_RANGE_NONE) if (file->u.get.range.type != QSE_HTTP_RANGE_NONE)
{ {
qse_mchar_t tmp[4][64]; qse_mchar_t tmp[4][64];