aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server
AgeCommit message (Collapse)Author
2013-08-23Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-08-23Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_transport.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl.erl lib/ssl/src/ssl_internal.hrl lib/ssl/src/tls_connection.erl lib/ssl/vsn.mk
2013-08-22Merge branch 'jw/fix-httpd-erl-script-nocache/OTP-11260' into maintFredrik Gustafsson
* jw/fix-httpd-erl-script-nocache/OTP-11260: inets: added simple testcase for option erl_script_nocache Fix httpd config option 'erl_script_nocache'
2013-08-21[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel ↵Fredrik Gustafsson
added as option to inets conf file
2013-07-01Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.appup.src lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk
2013-06-27inets: removed obsolete codeFredrik Gustafsson
2013-06-22Fix httpd config option 'erl_script_nocache'Johannes Weißl
This fixes the usage of the httpd configuration option 'erl_script_nocache', which got ignored before. Attention: Before, the option 'script_nocache' also changed the behavior for mod_esi, now it only affects mod_cgi.
2013-04-15inets: stop block timer with the right argumentsFredrik Gustafsson
2013-02-20inets httpd: Handle ipfamily option correctly when listning to port 0Ingela Anderton Andin
2013-02-18inets: Improve ssl handlingIngela Anderton Andin
httpc: CTfy test suite httpd: Simplify ssl configuration OTP-10846
2013-02-14inets httpd: The option modules now defaults to its documented default value.Ingela Anderton Andin
OTP-10844
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update copyright yearsBjörn-Egil Dahlberg
2012-11-16Merge branch 'maint'Fredrik Gustafsson
* maint: Increased waiting time to check if socket is down Fine adjustments of slowdos alg Changes to slowdos testcase Doc for test case slowdose Bumped version nr Added testcases för minimum_bytes_per_second option Reduced checking of bytes per second to every second Documentation for minimum_bytes_per_seconds option Changed property to minimum_bytes_per_second and checking if is integer on start Changed to Bytes Per Second when checking clients rate, new options {byte_limit, integer()} Option {bit_limit, integer()} to close sockets where clients are too slow
2012-11-14Fine adjustments of slowdos algFredrik Gustafsson
2012-11-09Reduced checking of bytes per second to every secondFredrik Gustafsson
2012-11-06Changed property to minimum_bytes_per_second and checking if is integer on startFredrik Gustafsson
2012-11-06Changed to Bytes Per Second when checking clients rate, new options ↵Fredrik Gustafsson
{byte_limit, integer()}
2012-11-06Option {bit_limit, integer()} to close sockets where clients are too slowFredrik Gustafsson
2012-10-02inets: Dialyzer fixesIngela Anderton Andin
2012-08-29inets: Dialyzer spec fixesIngela Anderton Andin
2012-06-05Update to work with whitespace in exec pathLukas Larsson
OTP-10106 OTP-10107
2012-03-30Update copyright yearsBjörn-Egil Dahlberg
2012-02-08[inets/httpd] Options parsing minor improvementMicael Karlberg
2012-02-06Merge branch 'bmk/inets/httpc/checking_ipv6_on_windows' into ↵Micael Karlberg
bmk/inets/inets59_integration
2012-02-03[inets] Added verbosity printout to improve error detectionMicael Karlberg
Added verbosity printouts to detect error reason for file access error on windows.
2012-02-03[inets/httpd] Add server tokens config optionMicael Karlberg
Added ability to configure the server software header field (with the server_tokens config option). OTP-9805
2011-12-09Update copyright yearsBjörn-Egil Dahlberg
2011-12-05Fix typo in mod_responsecontrol.erlTuncer Ayaz
2011-11-23Merge branch 'bmk/inets/dialyzer_fixes/OTP-9736' into ↵Micael Karlberg
bmk/inets/inets58_integration2
2011-11-23Fixed acceptor exit warnings (detected by dialyzer).Micael Karlberg
Also fixed cookie_header/3 and updated documented accordingly. Also added documentation for undocumented URI parse option.
2011-11-22Merge branch 'bmk/inets/httpd/bad_msg_size/OTP-9733' into ↵Micael Karlberg
bmk/inets/inets58_integration2
2011-11-22[httpd] Sometimes entries in the transfer log was written with the messageMicael Karlberg
size as list of numbers. This list was actually the size as a string, e.g. "123", written with the control sequence ~w. This has now been corrected so that any string is converted to an integer (if possible). OTP-9733
2011-11-21Various minor dialyzer related cleanup.Micael Karlberg
2011-11-16[httpd] Fix logging of content length in mod_log.Micael Karlberg
Garrett Smith OTP-9715 Merge branch 'gs/mod_log-fix' into bmk/inets/httpd/content_len_in_mod_log/OTP-9715
2011-11-15Merge branch 'maint-r14'Micael Karlberg
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_uri.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk
2011-11-09[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674 Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674' into bmk/inets/inets572_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2011-11-09Initial merge from r13 topic branch. With minimal cleanup.Micael Karlberg
Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r13/OTP-9674' into bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_server/mod_responsecontrol.erl lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpd_1_1.erl lib/inets/test/httpd_SUITE.erl lib/inets/test/httpd_mod.erl lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-09Aftermerge cleanup.Micael Karlberg
2011-11-09Initial merge from r13 topic branch. With minimal cleanup.Micael Karlberg
Merge branch 'bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655' into bmk/inets/httpd/xss_when_erl_encoded/r14/OTP-9655 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_uri.erl lib/inets/src/http_lib/http_util.erl lib/inets/src/http_server/httpd_file.erl lib/inets/src/http_server/httpd_request.erl lib/inets/src/http_server/httpd_request_handler.erl lib/inets/src/http_server/httpd_util.erl lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpc_SUITE.erl lib/inets/test/httpd_SUITE.erl lib/inets/test/httpd_basic_SUITE.erl lib/inets/test/httpd_test_lib.erl lib/inets/vsn.mk
2011-11-01[httpd] GET request with malformed header date causedMicael Karlberg
server crash (non-fatal) with no reply to client. Will now result in a reply with status code 400. OTP-9674
2011-10-26Fixed HTML encode. First *try* to hex decode uri, and thenMicael Karlberg
do the actual html encode. OTP-9655
2011-10-26Fixed hex-decoding.Micael Karlberg
OTP-9655
2011-10-25The XSS prevention methods used was confused if theMicael Karlberg
URL was encoded (hex-encoded). OTP-9655
2011-09-29Merge branch 'dev' into majorBjörn-Egil Dahlberg
* dev: Update copyright years
2011-09-29Update copyright yearsBjörn-Egil Dahlberg
2011-09-24Fix logging of content length in mod_logGarrett Smith
mod_log uses content length from response headers when logging transfer length, which is a string. It needs to be converted to an integer when logged.
2011-09-23Merge branch 'dev' into majorMicael Karlberg
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpc_cookie_SUITE.erl lib/inets/vsn.mk
2011-09-23[httpc] Parsing of a cookie expire date should be more forgiving.Micael Karlberg
That is, if the parsing fails, the date should be ignored. Also added support for (yet another) date format: "Tue Jan 01 08:00:01 2036 GMT". OTP-9433 [httpc] Rewrote cookie parsing. Among other things solving cookie processing from www.expedia.com. OTP-9434 [httpd] Fix httpd directory traversal on Windows. Directory traversal was possible on Windows where backward slash is used as directory separator. Andr�s Veres-Szentkir�lyi. OTP-9561 Merge branch 'bmk/inets/inets571_integration' into dev
2011-09-20Merge branch 'dev' into majorHenrik Nord
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 05:45:29 +0000