minor fix in hio_dev_sck_sendfileok()
This commit is contained in:
parent
8273f0127a
commit
d4eed93ac9
@ -974,9 +974,9 @@ if (hio_htre_getcontentlen(req) > 0)
|
||||
else if (hio_comp_bcstr_limited(qpath, "/txt/", 5, 1) == 0)
|
||||
x = hio_svc_htts_dotxt(htts, csck, req, 200, "text/plain", qpath);
|
||||
else if (hio_comp_bcstr_limited(qpath, "/cgi/", 5, 1) == 0)
|
||||
x = hio_svc_htts_docgi(htts, csck, req, "", hio_htre_getqpath(req));
|
||||
x = hio_svc_htts_docgi(htts, csck, req, "", qpath + 4);
|
||||
else
|
||||
x = hio_svc_htts_dofile(htts, csck, req, "", hio_htre_getqpath(req), "text/plain");
|
||||
x = hio_svc_htts_dofile(htts, csck, req, "", qpath, "text/plain");
|
||||
if (x <= -1) goto oops;
|
||||
}
|
||||
#if 0
|
||||
|
@ -203,9 +203,9 @@ if (hio_htre_getcontentlen(req) > 0)
|
||||
else if (hio_comp_bcstr_limited(qpath, "/txt/", 5, 1) == 0)
|
||||
x = hio_svc_htts_dotxt(htts, csck, req, 200, "text/plain", qpath);
|
||||
else if (hio_comp_bcstr_limited(qpath, "/cgi/", 5, 1) == 0)
|
||||
x = hio_svc_htts_docgi(htts, csck, req, "", hio_htre_getqpath(req));
|
||||
x = hio_svc_htts_docgi(htts, csck, req, "", qpath + 4);
|
||||
else
|
||||
x = hio_svc_htts_dofile(htts, csck, req, "", hio_htre_getqpath(req), "text/plain");
|
||||
x = hio_svc_htts_dofile(htts, csck, req, "", qpath, "text/plain");
|
||||
if (x <= -1) goto oops;
|
||||
}
|
||||
#if 0
|
||||
|
@ -32,6 +32,10 @@
|
||||
#include <sys/stat.h>
|
||||
#include <stdlib.h> /* setenv, clearenv */
|
||||
|
||||
#if defined(HAVE_CRT_EXTERNS_H)
|
||||
# include <crt_externs.h> /* _NSGetEnviron */
|
||||
#endif
|
||||
|
||||
#define CGI_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH
|
||||
|
||||
enum cgi_res_mode_t
|
||||
@ -830,6 +834,12 @@ static int cgi_peer_on_fork (hio_dev_pro_t* pro, void* fork_ctx)
|
||||
lang = hio_dupbcstr(hio, getenv("LANG"), HIO_NULL);
|
||||
#if defined(HAVE_CLEARENV)
|
||||
clearenv ();
|
||||
#elif defined(HAVE_CRT_EXTERNS_H)
|
||||
{
|
||||
char** environ = *_NSGetEnviron();
|
||||
if (environ) environ[0] = '\0';
|
||||
}
|
||||
|
||||
#else
|
||||
{
|
||||
extern char** environ;
|
||||
|
@ -2591,9 +2591,19 @@ int hio_dev_sck_shutdown (hio_dev_sck_t* dev, int how)
|
||||
int hio_dev_sck_sendfileok (hio_dev_sck_t* dev)
|
||||
{
|
||||
#if defined(USE_SSL)
|
||||
#if defined(HAVE_SENDFILE)
|
||||
/* unable to use sendfile over ssl */
|
||||
return !(dev->ssl);
|
||||
#else
|
||||
/* no send file implementation */
|
||||
return 0;
|
||||
#endif
|
||||
#else
|
||||
#if defined(HAVE_SENDFILE)
|
||||
return 1;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user