Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SSL shutdown

Browse Source 
SVN revision: 2054
This commit is contained in:
Stefan Ritt 2008-02-21 21:54:30 +00:00
parent 7742d2396e
commit 59fcd92412
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/elogd.c
View File

@ -26382,6 +26382,10 @@ int process_http_request(const char *request, int i_conn)
return_length = 0; return_length = 0;
/* check for Keep-alive */
if (strstr(request, "Keep-Alive") != NULL && use_keepalive)
keep_alive = TRUE;
/* extract logbook */ /* extract logbook */
if (strchr(request, '/') == NULL || strchr(request, '\r') == NULL || strstr(request, "HTTP") == NULL) { if (strchr(request, '/') == NULL || strchr(request, '\r') == NULL || strstr(request, "HTTP") == NULL) {
/* invalid request, make valid */ /* invalid request, make valid */
@ -26679,9 +26683,6 @@ int process_http_request(const char *request, int i_conn)
} }
} }
/* check for Keep-alive */
if (strstr(request, "Keep-Alive") != NULL && use_keepalive)
keep_alive = TRUE;
if (!authorized) { if (!authorized) {
/* return request for authorization */ /* return request for authorization */
rsprintf("HTTP/1.1 401 Authorization Required\r\n"); rsprintf("HTTP/1.1 401 Authorization Required\r\n");
@ -27332,7 +27333,7 @@ void server_loop(void)
ka_sock[i_conn] = 0; ka_sock[i_conn] = 0;
ka_ssl_con[i_conn] = ssl_con; ka_ssl_con[i_conn] = ssl_con;
continue; continue;
} }
} }
#endif #endif
@ -27426,7 +27427,7 @@ void server_loop(void)
if (!more_requests) { if (!more_requests) {
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(_sock, &readfds); FD_SET(_sock, &readfds);
timeout.tv_sec = 6; timeout.tv_sec = 1;
timeout.tv_usec = 0; timeout.tv_usec = 0;
status = select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); status = select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout);
if (FD_ISSET(_sock, &readfds)) { if (FD_ISSET(_sock, &readfds)) {
@ -27595,11 +27596,7 @@ void server_loop(void)
if (!keep_alive) { if (!keep_alive) {
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (_ssl_flag) { if (_ssl_flag) {
status = SSL_shutdown(ssl_con); SSL_shutdown(ssl_con);
if (!status) {
shutdown(_sock, 1);
SSL_shutdown(ssl_con);
}
SSL_free(ssl_con); SSL_free(ssl_con);
} }
#endif #endif