diff --git a/Changes b/Changes index 40f6689bc..0e486b7ff 100644 --- a/Changes +++ b/Changes @@ -839,3 +839,4 @@ seen. gmtime warning still there - Moved /svso and /svsnick to modules - Updated the win32 makefile - modulize documentation, some web server fixes, preparation for uabr +- Some more VFS/PHTML fixes, it actually works now, thanks to butter diff --git a/html/html/index.phtml b/html/html/index.phtml index aecb1732b..251cb568a 100644 --- a/html/html/index.phtml +++ b/html/html/index.phtml @@ -117,7 +117,7 @@ $ STATUSLINE $ SECTION
-$ DATA +$ DATA
diff --git a/src/modules/web/httpd.c b/src/modules/web/httpd.c index d6290b440..999451784 100644 --- a/src/modules/web/httpd.c +++ b/src/modules/web/httpd.c @@ -386,7 +386,9 @@ void sockprintf(HTTPd_Request *r, char *format, ...) vsprintf(r->inbuf, format, ap); strcat(r->inbuf, "\r\n"); va_end(ap); - send(r->fd, r->inbuf, strlen(r->inbuf), 0); + set_blocking(r->fd, NULL); + send(r->fd, r->inbuf, strlen(r->inbuf), 0), + set_non_blocking(r->fd, NULL); } diff --git a/src/modules/web/phtml.c b/src/modules/web/phtml.c index fd447a1a6..83ddb04cf 100644 --- a/src/modules/web/phtml.c +++ b/src/modules/web/phtml.c @@ -161,7 +161,6 @@ DLLFUNC int h_u_phtml(HTTPd_Request *r) if (!strcmp(s, "DATA")) { time_t tmpnow; - sockprintf(r, "%i
", section); if (section == SECTION_STATS) { tmpnow = TStime() - me.since; diff --git a/src/modules/web/vfs.c b/src/modules/web/vfs.c index ad7dd2864..0ee4e9eff 100644 --- a/src/modules/web/vfs.c +++ b/src/modules/web/vfs.c @@ -155,8 +155,6 @@ DLLFUNC int h_u_vfs(HTTPd_Request *r) j = send(r->fd, &p->cache[i], p->cachesize - i, 0); if (j == -1) { - ircd_log(LOG_ERROR, "send() error: %s", - strerror(ERRNO)); set_non_blocking(r->fd, NULL); return 1; }