diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-08 16:46:30 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:43 -0500 |
commit | 98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8 (patch) | |
tree | 044b24a249cc2b63c2f69214d7e7da288c170c74 /source4/web_server/http.c | |
parent | ce0ff008b5c5af931526d14fa6232f8647e0880f (diff) | |
download | samba-98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8.tar.gz samba-98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8.tar.bz2 samba-98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8.zip |
r25035: Fix some more warnings, use service pointer rather than service number in more places.
(This used to be commit df9cebcb97e20564359097148665bd519f31bc6f)
Diffstat (limited to 'source4/web_server/http.c')
-rw-r--r-- | source4/web_server/http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c index 985f1c0408..fb103f16c5 100644 --- a/source4/web_server/http.c +++ b/source4/web_server/http.c @@ -152,7 +152,7 @@ static int http_readFile(EspHandle handle, fd = open(path, O_RDONLY); if (fd == -1 || fstat(fd, &st) != 0 || !S_ISREG(st.st_mode)) goto failed; - *buf = talloc_size(handle, st.st_size+1); + *buf = talloc_array(handle, char, st.st_size+1); if (*buf == NULL) goto failed; if (read(fd, *buf, st.st_size) != st.st_size) goto failed; @@ -808,7 +808,7 @@ static void http_setup_session(struct esp_state *esp) s->data = NULL; s->te = NULL; s->edata = edata; - s->lifetime = lp_parm_int(-1, "web", "sessiontimeout", 900); + s->lifetime = lp_parm_int(NULL, "web", "sessiontimeout", 900); DLIST_ADD(edata->sessions, s); talloc_set_destructor(s, session_destructor); if (!generated_key) { |