Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
4b6f61ea
Commit
4b6f61ea
authored
Dec 22, 2006
by
Mark Andrews
Browse files
cleanup
parent
70232e6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/isc/httpd.c
View file @
4b6f61ea
...
...
@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: httpd.c,v 1.
6
2006/12/22 0
1:59:43
marka Exp $ */
/* $Id: httpd.c,v 1.
7
2006/12/22 0
4:20:52
marka Exp $ */
/*! \file */
...
...
@@ -264,12 +264,12 @@ isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task,
isc_socket_attach
(
sock
,
&
httpd
->
sock
);
httpd
->
task
=
NULL
;
isc_task_attach
(
task
,
&
httpd
->
task
);
httpd
->
timermgr
=
tmgr
;
/* XX
HTTP
G no attach function? */
httpd
->
timermgr
=
tmgr
;
/* XX
XML
G no attach function? */
ISC_LIST_INIT
(
httpd
->
running
);
ISC_LIST_INIT
(
httpd
->
urls
);
/* XX
HTTP
G ignore errors on isc_socket_listen() */
/* XX
XML
G ignore errors on isc_socket_listen() */
(
void
)
isc_socket_listen
(
sock
,
SOMAXCONN
);
result
=
isc_socket_accept
(
sock
,
task
,
isc_httpd_accept
,
httpd
);
...
...
@@ -331,8 +331,7 @@ httpdmgr_destroy(isc_httpdmgr_t *httpdmgr)
isc_mutex_destroy
(
&
httpdmgr
->
lock
);
mctx
=
httpdmgr
->
mctx
;
isc_mem_put
(
mctx
,
httpdmgr
,
sizeof
(
isc_httpdmgr_t
));
isc_mem_detach
(
&
mctx
);
isc_mem_putanddetach
(
&
mctx
,
httpdmgr
,
sizeof
(
isc_httpdmgr_t
));
EXIT
(
"httpdmgr_destroy"
);
}
...
...
@@ -497,14 +496,14 @@ isc_httpd_accept(isc_task_t *task, isc_event_t *ev)
}
if
(
nev
->
result
!=
ISC_R_SUCCESS
)
{
/* XX
HTTP
G log failure */
/* XX
XML
G log failure */
NOTICE
(
"accept returned failure, goto requeue"
);
goto
requeue
;
}
httpd
=
isc_mem_get
(
httpdmgr
->
mctx
,
sizeof
(
isc_httpd_t
));
if
(
httpd
==
NULL
)
{
/* XX
HTTP
G log failure */
/* XX
XML
G log failure */
NOTICE
(
"accept failed to allocate memory, goto requeue"
);
goto
requeue
;
}
...
...
@@ -543,7 +542,7 @@ isc_httpd_accept(isc_task_t *task, isc_event_t *ev)
result
=
isc_socket_accept
(
httpdmgr
->
sock
,
task
,
isc_httpd_accept
,
httpdmgr
);
if
(
result
!=
ISC_R_SUCCESS
)
{
/* XX
HTTP
G what to do? Log failure... */
/* XX
XML
G what to do? Log failure... */
NOTICE
(
"accept could not reaccept due to failure"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment