--- parser3/src/main/pa_http.C 2020/11/13 16:55:48 1.103 +++ parser3/src/main/pa_http.C 2026/10/17 23:11:25 1.142 @@ -1,8 +1,8 @@ /** @file Parser: http support functions. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_http.h" @@ -10,19 +10,15 @@ #include "pa_base64.h" #include "pa_charsets.h" #include "pa_request_charsets.h" -#include "pa_request.h" #include "pa_vfile.h" #include "pa_random.h" -volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.103 2020/11/13 16:55:48 moko Exp $" IDENT_PA_HTTP_H; - -#ifdef _MSC_VER -#include -#define socklen_t int -#else -#define closesocket close +#ifndef WIN32 +#include // for TCP_NODELAY #endif +volatile const char * IDENT_PA_HTTP_C="$Id: pa_http.C,v 1.142 2026/10/17 23:11:25 moko Exp $" IDENT_PA_HTTP_H; + // defines #define HTTP_METHOD_NAME "method" @@ -47,13 +43,56 @@ volatile const char * IDENT_PA_HTTP_C="$ #undef CRLF #define CRLF "\r\n" +#define HTTP_TIMEOUT_COMMENT "timeout occurred while retrieving document" + // helpers +#ifdef HTTPD_DEBUG +void pa_log(const char* fmt, ...); +#define LOG(action) action +#else +#define LOG(action) +#endif + +ssize_t pa_send(int sock, const char *buffer, size_t len){ + size_t total_sent = 0; + while (total_sent < len) { + ssize_t bytes_sent=pa_sock_send(sock, buffer + total_sent, len - total_sent); + if (bytes_sent < 0) { + return bytes_sent; + } else if (bytes_sent == 0) { + // Connection closed by the remote peer? + break; + } + LOG( + if(bytes_sent != len - total_sent) + pa_log("httpd [%d] partial send %d of (%d)", sock, bytes_sent, len - total_sent) + ); + total_sent += bytes_sent; + } + return total_sent; +} + +// socket operation failed on SO_*TIMEO timeout +static bool sock_timed_out(int no){ +#ifdef WIN32 + return no==WSAETIMEDOUT; +#else + return no==EAGAIN || no==EWOULDBLOCK || no==EINPROGRESS /* connect on linux */; +#endif +} + +static int check_socket_timeout(int no){ + if(sock_timed_out(no)) + throw Exception("http.timeout", 0, HTTP_TIMEOUT_COMMENT); + return no; +} + bool HTTP_Headers::add_header(const char *line){ const char *value=strchr(line, ':'); if(value && value != line){ // we need only headers, not the response code - Header header(str_upper(line, value-line), String::Body(value+1).trim(String::TRIM_BOTH, " \t\n\r")); + Header header = Header(String::Body(str_upper(line, value-line)), String::Body(value+1).trim(String::TRIM_BOTH, " \t\n\r")); if(header.name == String::Body(HTTP_CONTENT_TYPE_UPPER) && content_type.is_empty()) content_type=header.value; @@ -113,14 +152,14 @@ public: buf=(char *)pa_realloc(buf, size + 1); } - bool read(int sock, size_t size){ + bool read(SOCKET sock, size_t size){ if(length + size > buf_size) resize(buf_size * 2 + size); - ssize_t received_size=recv(sock, buf + length, size, 0); + ssize_t received_size=pa_sock_recv(sock, buf + length, size); if(received_size == 0) return false; if(received_size < 0) { - if(int no = pa_socks_errno()) + if(int no = check_socket_timeout(pa_socks_errno())) throw Exception("http.timeout", 0, "error receiving response: %s (%d)", pa_socks_strerr(no), no); return false; } @@ -180,16 +219,16 @@ public: ArrayString aheaders; header_block.split(aheaders, 0, "\n"); - Array_iterator i(aheaders); + ArrayString::Iterator i(aheaders); i.next(); // skipping status - for(;i.has_next();){ + for(;i;){ const char *line=i.next()->cstr(); if(!headers.add_header(line)) throw Exception("http.response", 0, "bad response from host - bad header \"%s\"", line); } } - int read_response(int sock, bool fail_on_status_ne_200); + int read_response(SOCKET sock, bool fail_on_status_ne_200); }; enum HTTP_response_state { @@ -198,7 +237,7 @@ enum HTTP_response_state { HTTP_BODY }; -int HTTP_response::read_response(int sock, bool fail_on_status_ne_200) { +int HTTP_response::read_response(SOCKET sock, bool fail_on_status_ne_200) { HTTP_response_state state=HTTP_STATUS_CODE; int result=0; @@ -256,32 +295,47 @@ int HTTP_response::read_response(int soc /* ********************** request *************************** */ #if defined(SIGALRM) && defined(HAVE_SIGSETJMP) && defined(HAVE_SIGLONGJMP) -# define PA_USE_ALARM +# define PA_HAVE_ALARM #endif -#ifdef PA_USE_ALARM +#ifdef PA_HAVE_ALARM static sigjmp_buf timeout_env; static void timeout_handler(int /*sig*/){ siglongjmp(timeout_env, 1); } -#define ALARM(value) alarm(value) + +// alarm is per process, threads use SO_*TIMEO +#define PA_USE_ALARM (HTTPD_Server::mode != HTTPD_Server::MULTITHREADED) + +#define ALARM(value) if(PA_USE_ALARM) alarm(value) #else +#define PA_USE_ALARM false #define ALARM(value) #endif +// SO_*TIMEO can be defined in .h but not implemented in protocol, so errors are ignored +static void set_socket_timeout(SOCKET sock, int option, int timeout_secs){ +#ifdef WIN32 + int timeout=timeout_secs < INT_MAX/1000 ? timeout_secs*1000 : 0 /* infinite */; +#else + struct timeval timeout={timeout_secs, 0}; +#endif + setsockopt(sock, SOL_SOCKET, option, (const char*)&timeout, sizeof(timeout)); +} + static int http_request(HTTP_response& response, const char* host, short port, const char* request, size_t request_size, int timeout_secs, bool fail_on_status_ne_200) { if(!host) throw Exception("http.host", 0, "zero hostname"); //never - volatile int sock=-1; // to prevent makeing it register variable, because it will be clobbered by longjmp [thanks gcc warning] + volatile SOCKET sock=INVALID_SOCKET; // to prevent makeing it register variable, because it will be clobbered by longjmp [thanks gcc warning] -#ifdef PA_USE_ALARM - signal(SIGALRM, timeout_handler); - if(sigsetjmp(timeout_env, 1)) { +#ifdef PA_HAVE_ALARM + if(PA_USE_ALARM) signal(SIGALRM, timeout_handler); + if(PA_USE_ALARM && sigsetjmp(timeout_env, 1)) { // duplicating closesocket to make code more simple for old compilers - if(sock>=0) + if(sock != INVALID_SOCKET) closesocket(sock); - throw Exception("http.timeout", 0, "timeout occurred while retrieving document"); + throw Exception("http.timeout", 0, HTTP_TIMEOUT_COMMENT); return 0; // never } else #endif @@ -292,11 +346,11 @@ static int http_request(HTTP_response& r struct sockaddr_in dest; if(!set_addr(&dest, host, port)) - throw Exception("http.host", 0, "can not resolve hostname \"%s\"", host); + throw Exception("http.host", 0, "cannot resolve hostname \"%s\"", host); - if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/))<0) { + if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/)) == INVALID_SOCKET) { int no=pa_socks_errno(); - throw Exception("http.connect", 0, "can not make socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("http.connect", 0, "cannot make socket: %s (%d)", pa_socks_strerr(no), no); } // To enable SO_DONTLINGER (that is, disable SO_LINGER) @@ -304,22 +358,18 @@ static int http_request(HTTP_response& r linger dont_linger={0,0}; setsockopt(sock, SOL_SOCKET, SO_LINGER, (const char *)&dont_linger, sizeof(dont_linger)); -#ifdef WIN32 -// SO_*TIMEO can be defined in .h but not implemlemented in protocol, -// failing subsequently with Option not supported by protocol (99) message -// could not suppress that, so leaving this only for win32 - int timeout_ms=timeout_secs*1000; - setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout_ms, sizeof(timeout_ms)); - setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout_ms, sizeof(timeout_ms)); -#endif + if(!PA_USE_ALARM){ + set_socket_timeout(sock, SO_SNDTIMEO, timeout_secs); + set_socket_timeout(sock, SO_RCVTIMEO, timeout_secs); + } if(connect(sock, (struct sockaddr *)&dest, sizeof(dest))) { - int no=pa_socks_errno(); - throw Exception("http.connect", 0, "can not connect to host \"%s\": %s (%d)", host, pa_socks_strerr(no), no); + int no=check_socket_timeout(pa_socks_errno()); + throw Exception("http.connect", 0, "cannot connect to host \"%s\": %s (%d)", host, pa_socks_strerr(no), no); } - if(send(sock, request, request_size, 0)!=(ssize_t)request_size) { - int no=pa_socks_errno(); + if(pa_send(sock, request, request_size) < 0) { + int no=check_socket_timeout(pa_socks_errno()); throw Exception("http.timeout", 0, "error sending request: %s (%d)", pa_socks_strerr(no), no); } @@ -329,7 +379,7 @@ static int http_request(HTTP_response& r return result; } catch(...) { ALARM(0); - if(sock>=0) + if(sock != INVALID_SOCKET) closesocket(sock); rethrow; } @@ -508,17 +558,31 @@ static void form_table_value2part(Table: form_string_value2part(part->info->key, *row->get(0), *part); } -static void form_value2part(HashStringValue::key_type key, HashStringValue::value_type value, FormPart& part) { - if(const String* svalue=value->get_string()) +static bool form_element_value2part(HashStringValue::key_type key, HashStringValue::value_type value, FormPart& part) { + if(const String* svalue=value->get_string()){ form_string_value2part(key, *svalue, part); - else if(Table* tvalue=value->get_table()) { + } else if(VFile* vfile=dynamic_cast(value)){ + form_file_value2part(key, *vfile, part); + } else { + return false; + } + return true; +} + +static void form_value2part(HashStringValue::key_type key, HashStringValue::value_type value, FormPart& part) { + if(form_element_value2part(key, value, part)) { + // string or file + } else if(Table* tvalue=value->get_table()) { Form_table_value2string_info info(key, *part.string); part.info = &info; tvalue->for_each(form_table_value2part, &part); - } else if(VFile* vfile=static_cast(value->as("file"))){ - form_file_value2part(key, *vfile, part); + } else if(HashStringValue* hvalue=value->get_hash()){ + // hash or array: several strings/files under the same field name + for(HashStringValue::Iterator j(*hvalue); j; j.next()) + if(!form_element_value2part(key, j.value(), part)) + throw Exception(PARSER_RUNTIME, new String(j.key(), String::L_TAINTED), "is %s, multiple values of " HTTP_FORM_NAME " field '%s' must be strings or files", j.value()->type(), key.cstr()); } else - throw Exception(PARSER_RUNTIME, new String(key, String::L_TAINTED), "is %s, " HTTP_FORM_NAME " option value can be string, table or file only", value->type()); + throw Exception(PARSER_RUNTIME, new String(key, String::L_TAINTED), "is %s, " HTTP_FORM_NAME " field value can be string, table, file, hash or array", value->type()); } const char* pa_form2string_multipart(HashStringValue& form, Request& r, const char* boundary, size_t& post_size){ @@ -555,7 +619,8 @@ static ArrayString* parse_cookie(Request if(first_pair) { // name + value name=sname; - value=smeaning; + if(smeaning) + value=smeaning; first_pair=false; } else { const String& slower=sname->change_case(r.charsets.source(), String::CC_LOWER); @@ -598,7 +663,7 @@ static ArrayString* parse_cookie(Request Table* parse_cookies(Request& r, Table *cookies){ Table& result=*new Table(new Cookies_table_template_columns); - for(Array_iterator i(*cookies); i.has_next(); ) + for(Array_iterator i(*cookies); i; ) if(ArrayString* row=parse_cookie(r, *i.next()->get(0))) result+=row; @@ -707,7 +772,7 @@ File_read_http_result pa_internal_file_r if(encode){ if(method_is_get) - throw Exception(PARSER_RUNTIME, 0, "you can not use $." HTTP_FORM_ENCTYPE_NAME " option with method GET"); + throw Exception(PARSER_RUNTIME, 0, "you cannot use $." HTTP_FORM_ENCTYPE_NAME " option with method GET"); multipart=strcasecmp(encode, HTTP_CONTENT_TYPE_MULTIPART_FORMDATA)==0; @@ -717,10 +782,10 @@ File_read_http_result pa_internal_file_r if(vbody){ if(method_is_get) - throw Exception(PARSER_RUNTIME, 0, "you can not use $." HTTP_BODY_NAME " option with method GET"); + throw Exception(PARSER_RUNTIME, 0, "you cannot use $." HTTP_BODY_NAME " option with method GET"); if(form) - throw Exception(PARSER_RUNTIME, 0, "you can not use options $." HTTP_BODY_NAME " and $." HTTP_FORM_NAME " together"); + throw Exception(PARSER_RUNTIME, 0, "you cannot use options $." HTTP_BODY_NAME " and $." HTTP_FORM_NAME " together"); } //preparing request @@ -739,7 +804,7 @@ File_read_http_result pa_internal_file_r throw Exception(PARSER_RUNTIME, &connect_string, "does not start with http://"); //never current+=7; - strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; + pa_strncpy(host, current, sizeof(host)); char* host_uri=lsplit(host, '/'); uri=host_uri?current+(host_uri-1-host):"/"; char* port_cstr=lsplit(host, ':'); @@ -835,7 +900,7 @@ File_read_http_result pa_internal_file_r } if(request_body) - head << "Content-Length: " << format(post_size, "%u") << CRLF; + head << "Content-Length: " << pa_uitoa(post_size) << CRLF; head << CRLF; @@ -867,7 +932,7 @@ File_read_http_result pa_internal_file_r result.headers=new HashStringValue; VHash* vtables=new VHash; - result.headers->put("tables", vtables); + HASH_PUT_CSTR(*result.headers, "tables", vtables); if (!real_remote_charset && !response.headers.content_type.is_empty()) real_remote_charset=detect_charset(response.headers.content_type.cstr()); @@ -878,7 +943,7 @@ File_read_http_result pa_internal_file_r if (!real_remote_charset) real_remote_charset=asked_remote_charset; // never null - for(Array_iterator i(response.headers.headers); i.has_next(); ){ + for(Array_iterator i(response.headers.headers); i; ){ HTTP_Headers::Header header=i.next(); header.transcode(*real_remote_charset, r.charsets.source()); @@ -891,7 +956,7 @@ File_read_http_result pa_internal_file_r // filling $.cookies if(vcookies=vtables->hash().get("SET-COOKIE")) - result.headers->put(HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table()))); + HASH_PUT_CSTR(*result.headers, HTTP_COOKIES_NAME, new VTable(parse_cookies(r, vcookies->get_table()))); // output response String::C real_body=String::C(raw_body, raw_body_size); @@ -922,7 +987,7 @@ enum EscapeState { static bool check_uri(const char *uri){ EscapeState state=Initial; - uint escapedValue; + uint escapedValue=0; const char *pattern="/../"; const char *pos=pattern; @@ -953,7 +1018,7 @@ static bool check_uri(const char *uri){ case EscapeSecond: if(isxdigit(c)){ state=Default; - c=escapedValue + hex_value[c]; + c=(uchar)(escapedValue + hex_value[c]); // implementing Apache AllowEncodedSlashes Off just in case if(c=='/' || c=='\\') @@ -981,9 +1046,9 @@ public: HTTPD_request() : HTTP_response(), method(NULL), uri(NULL){}; - ssize_t pa_recv(int sockfd, void *buf, size_t len); + ssize_t pa_recv(SOCKET sockfd, char *buf, size_t len); - bool read(int sock, size_t size){ + bool read(SOCKET sock, size_t size){ if(length + size > buf_size) resize(buf_size * 2 + size); ssize_t received_size=pa_recv(sock, buf + length, size); @@ -991,7 +1056,7 @@ public: return false; if(received_size < 0) { if(int no = pa_socks_errno()) - throw Exception("httpd.timeout", 0, "error receiving request: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.read", 0, "error receiving request: %s (%d)", pa_socks_strerr(no), no); return false; } length+=received_size; @@ -1018,8 +1083,8 @@ public: } - void read_header(int); - size_t read_post(int, char *, size_t); + bool read_header(SOCKET); + size_t read_post(SOCKET, char *, size_t); }; enum HTTPD_request_state { @@ -1027,23 +1092,50 @@ enum HTTPD_request_state { HTTPD_HEADERS }; -ssize_t HTTPD_request::pa_recv(int sockfd, void *buf, size_t len){ -#ifdef PA_USE_ALARM - signal(SIGALRM, timeout_handler); - if(sigsetjmp(timeout_env, 1)) { - throw Exception("httpd.timeout", 0, "timeout occurred while receiving request"); - return 0; // never +// timeout on "void" connection is normal +#define PA_RECV_TIMEOUT \ + LOG(pa_log("httpd [%d] recv got %d sec timeout", sockfd, pa_httpd_timeout)); \ + if(length) \ + throw Exception("httpd.timeout", 0, "timeout occurred while receiving request"); \ + return 0; + +ssize_t HTTPD_request::pa_recv(SOCKET sockfd, char *buffer, size_t len){ + LOG(pa_log("httpd [%d] recv %d appending to %d ...", sockfd, len, length)); + +#ifdef PA_HAVE_ALARM + if(PA_USE_ALARM) signal(SIGALRM, timeout_handler); + if(PA_USE_ALARM && sigsetjmp(timeout_env, 1)) { + PA_RECV_TIMEOUT } else #endif { ALARM(pa_httpd_timeout); - ssize_t result=recv(sockfd, buf, len, 0); + ssize_t result=pa_sock_recv(sockfd, buffer, len); ALARM(0); + if(result < 0 && sock_timed_out(pa_socks_errno())) { + PA_RECV_TIMEOUT + } + LOG(pa_log("httpd [%d] recv got %d bytes", sockfd, result)); + LOG(pa_log("httpd [%d] %s", sockfd, buffer)); return result; } } -void HTTPD_request::read_header(int sock) { +static bool valid_http_method(const char * method){ + return method && ( + !strcmp(method, "GET") || + !strcmp(method, "HEAD") || + !strcmp(method, "POST") || + !strcmp(method, "PUT") || + !strcmp(method, "DELETE") || + !strcmp(method, "CONNECT") || + !strcmp(method, "OPTIONS") || + !strcmp(method, "TRACE") || + !strcmp(method, "PATCH") + ); +} + +bool HTTPD_request::read_header(SOCKET sock) { enum HTTPD_request_state state = HTTPD_METHOD; size_t chunk_size = 0x400*4; @@ -1059,14 +1151,7 @@ void HTTPD_request::read_header(int sock char *method_line = pa_strdup(buf, method_size); method = extract_method(method_line); - if(!method || - strcmp(method, "GET") && - strcmp(method, "HEAD") && - strcmp(method, "POST") && - strcmp(method, "PUT") && - strcmp(method, "DELETE") && - strcmp(method, "PATCH") - ) + if(!valid_http_method(method)) throw Exception("httpd.method", new String(method ? method : method_line), "invalid request method"); state = HTTPD_HEADERS; } @@ -1076,11 +1161,16 @@ void HTTPD_request::read_header(int sock break; parse_headers(); - return; + return true; } } } + if(!length){ // browsers open connections in advance and they will be empty unless user requests more pages + LOG(pa_log("httpd [%d] void request", sock)); + return false; + } + if(state == HTTPD_METHOD) throw Exception("httpd.request", 0, "bad request from host - no method found (size=%u)", length); @@ -1088,9 +1178,11 @@ void HTTPD_request::read_header(int sock parse_headers(); body_offset=length; } + + return true; } -size_t HTTPD_request::read_post(int sock, char *body, size_t max_bytes) { +size_t HTTPD_request::read_post(SOCKET sock, char *body, size_t max_bytes) { size_t total_read = min(length - body_offset, max_bytes); memcpy(body, buf + body_offset, total_read); @@ -1100,7 +1192,7 @@ size_t HTTPD_request::read_post(int sock return total_read; if(received_size < 0) { if(int no = pa_socks_errno()) - throw Exception("httpd.timeout", new String(uri), "error receiving request body: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.read", new String(uri), "error receiving request body: %s (%d)", pa_socks_strerr(no), no); return total_read; } total_read += received_size; @@ -1130,9 +1222,13 @@ uint64_t HTTPD_Connection::content_lengt return request->headers.content_length; } -void HTTPD_Connection::read_header(){ +bool HTTPD_Connection::read_header(){ request = new HTTPD_request(); - request->read_header(sock); + bool result = request->read_header(sock); + LOG(if(result){ + pa_log("httpd [%d] got %s \"%s\"", sock, method(), uri()); + }) + return result; } size_t HTTPD_Connection::read_post(char *body, size_t max_bytes) { @@ -1140,36 +1236,51 @@ size_t HTTPD_Connection::read_post(char } size_t HTTPD_Connection::send_body(const void *buf, size_t size) { - if(send(sock, (const char*)buf, size, 0) != (ssize_t)size) { + LOG(pa_log("httpd [%d] response %d bytes", sock, size)); + LOG(pa_log("httpd [%d] %s", sock, buf)); + ssize_t result=pa_send(sock, (const char*)buf, size); + if(result < 0) { int no=pa_socks_errno(); - throw Exception("httpd.timeout", 0, "error sending response: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.write", 0, "error sending response: %s (%d)", pa_socks_strerr(no), no); } - return size; + return result; } -HTTPD_Connection::~HTTPD_Connection(){ - if(sock != -1) - closesocket(sock); +String::C HTTPD_Connection::unprocessed() { + return String::C(request->buf + request->body_offset, request->length - request->body_offset); +} + +size_t HTTPD_Connection::receive(char *dest, size_t max_bytes) { + ssize_t received_size=pa_sock_recv(sock, dest, max_bytes); + if(received_size < 0) { + int no=pa_socks_errno(); + if(pa_socks_is_reset(no)) + return 0; + throw Exception("httpd.read", 0, "error receiving data: %s (%d)", pa_socks_strerr(no), no); + } + return received_size; +} + +void HTTPD_Connection::set_nodelay() { + int nodelay=1; + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay)); } -static int sock_ready(int fd,int operation,int timeout_value){ - struct timeval timeout = {0, timeout_value * 1000}; - fd_set fds; - FD_ZERO(&fds); - FD_SET(fd, &fds); - switch (operation){ - case 0: return select(fd + 1, &fds, NULL, NULL, &timeout)>0; /* read */ - case 1: return select(fd + 1, NULL, &fds, NULL, &timeout)>0; /* write */ - default: return select(fd + 1, &fds, &fds, NULL, &timeout)>0; /* both */ +void HTTPD_Connection::set_send_timeout(int timeout_secs) { + set_socket_timeout(sock, SO_SNDTIMEO, timeout_secs); +} + +HTTPD_Connection::~HTTPD_Connection(){ + if(sock != INVALID_SOCKET){ + LOG(pa_log("httpd [%d] closed", sock)); + closesocket(sock); } } -bool HTTPD_Connection::accept(int server_sock, int timeout_value) { - int ready = sock_ready(server_sock, 0, timeout_value); +bool HTTPD_Connection::accept(SOCKET server_sock, int timeout_value) { + int ready = pa_sock_ready(server_sock, false, timeout_value); if (ready < 0) { int no=pa_socks_errno(); - if(no == EINTR) - return false; throw Exception("httpd.accept", 0, "error waiting for connection: %s (%d)", pa_socks_strerr(no), no); } if (ready == 0) @@ -1180,38 +1291,63 @@ bool HTTPD_Connection::accept(int server memset(&addr, 0, sock_addr_len); sock = ::accept(server_sock, (struct sockaddr *)&addr, &sock_addr_len); - if(server_sock == -1){ + if(sock == INVALID_SOCKET){ int no=pa_socks_errno(); throw Exception("httpd.accept", 0, "error accepting connection: %s (%d)", pa_socks_strerr(no), no); } +// Has no positive performance effect, requires include +// static int sock_on=1; +// setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&sock_on, sizeof(sock_on)); + + if(!PA_USE_ALARM) + set_socket_timeout(sock, SO_RCVTIMEO, pa_httpd_timeout); + remote_addr = pa_strdup(inet_ntoa(addr.sin_addr)); + LOG(pa_log("httpd [%d] accepted from %s", sock, remote_addr)); return true; } -int HTTPD_Server::bind(const char *host_port){ +HTTPD_Server::HTTPD_MODE HTTPD_Server::mode = HTTPD_Server::SEQUENTIAL; +const char *HTTPD_Server::port=NULL; + +void HTTPD_Server::set_mode(const String &value){ + if(value == "sequental") mode = SEQUENTIAL; +#ifdef HAVE_TLS + else if (value == "threaded") mode = MULTITHREADED; +#endif +#ifdef _MSC_VER + else throw Exception("httpd.mode", &value, "$MAIN:HTTPD.mode must be 'sequental' or 'threaded'"); +#else + else if (value == "parallel") mode = PARALLEL; + else throw Exception("httpd.mode", &value, "$MAIN:HTTPD.mode must be 'sequental', 'parallel' or 'threaded'"); +#endif +} + +SOCKET HTTPD_Server::bind(const char *host_port){ struct sockaddr_in me; - const char *port = strchr(host_port, ':'); + port = strchr(host_port, ':'); const char *host = NULL; - if(port && port > host_port){ - host = pa_strdup(host_port, port - host_port); + if(port){ + if(port > host_port) + host = pa_strdup(host_port, port - host_port); port += 1; } else { port = host_port; } - if(!set_addr(&me, host, pa_atoui(port))){ + if(!set_addr(&me, host, (short)pa_atoui(port))){ if (host) - throw Exception("httpd.bind", 0, "can not resolve hostname \"%s\"", host); + throw Exception("httpd.bind", 0, "cannot resolve hostname \"%s\"", host); me.sin_addr.s_addr=INADDR_ANY; } - int sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/); + SOCKET sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/); - if(sock < 0){ + if(sock == INVALID_SOCKET){ int no=pa_socks_errno(); - throw Exception("httpd.bind", 0, "can not make socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.bind", 0, "cannot make socket: %s (%d)", pa_socks_strerr(no), no); } static int sock_on = 1; @@ -1222,7 +1358,7 @@ int HTTPD_Server::bind(const char *host_ listen(sock, 16)) { closesocket(sock); int no = pa_socks_errno(); - throw Exception("httpd.bind", 0, "can not bind socket: %s (%d)", pa_socks_strerr(no), no); + throw Exception("httpd.bind", 0, "cannot bind socket: %s (%d)", pa_socks_strerr(no), no); } return sock; }