Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
|
|
|
|
httpc: CTfy test suite
httpd: Simplify ssl configuration OTP-10846
|
|
OTP-10844
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
{byte_limit, integer()}
|
|
|
|
|
|
|
|
OTP-10106
OTP-10107
|
|
|
|
|
|
bmk/inets/inets59_integration
|
|
Added verbosity printouts to detect error reason for
file access error on windows.
|
|
Added ability to configure the server software
header field (with the server_tokens config option).
OTP-9805
|
|
|
|
|
|
bmk/inets/inets58_integration2
|
|
Also fixed cookie_header/3 and updated documented
accordingly. Also added documentation for undocumented
URI parse option.
|
|
bmk/inets/inets58_integration2
|
|
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
|
|
|
|
Garrett Smith
OTP-9715
Merge branch 'gs/mod_log-fix' into bmk/inets/httpd/content_len_in_mod_log/OTP-9715
|
|
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
|
|
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
|
|
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
|
|
|
|
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
|
|
server crash (non-fatal) with no reply to client. Will
now result in a reply with status code 400.
OTP-9674
|
|
do the actual html encode.
OTP-9655
|
|
OTP-9655
|
|
URL was encoded (hex-encoded).
OTP-9655
|
|
* dev:
Update copyright years
|
|
|
|
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.
|
|
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
|
|
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
|
|
Conflicts:
erts/aclocal.m4
erts/include/internal/ethread_header_config.h.in
|
|
|
|
bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561
|
|
|
|
|
|
are URL-encoded. Added support in http-client to use
URL-encoding. Also added the missing include directory
for the inets application.
OTP-8940
[httpd] Prevent XSS in error pages.
Prevent user controlled input from being interpreted
as HTML in error pages by encoding the reserved HTML
characters.
Michael Santos
OTP-9124
|