aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
AgeCommit message (Collapse)Author
2013-10-10Merge branch 'maint'Fredrik Gustafsson
2013-10-10Merge branch 'weisslj/fix-httpd-timeout-options/OTP-11276' into maintFredrik Gustafsson
* weisslj/fix-httpd-timeout-options/OTP-11276: inets: added testcase for keep_alive_timeout Add test for httpd config option 'script_timeout' Fix httpd config option 'script_timeout' Fix httpd config option 'keep_alive_timeout'
2013-09-30inets: added testcase for keep_alive_timeoutFredrik Gustafsson
2013-09-19Add test for httpd config option 'script_timeout'Johannes Weißl
The option got ignored before 720721e.
2013-09-17Merge tag 'OTP_R16B02'Magnus Lidén
The R16B02 release Conflicts: lib/sasl/vsn.mk
2013-09-16Prepare releaseOTP_R16B02Erlang/OTP
2013-09-06Change encoding of troublesome notes.xml files to utf-8Björn Gustavsson
Most notes.xml files will be updated in every release and cause the kind of the problems described in the previous commit.
2013-09-05Fix httpd config option 'script_timeout'Johannes Weißl
This fixes the usage of the httpd configuration option 'script_timeout', which got ignored before. The documentation states that the value is in seconds, which was true when using the Apache like configuration file, but not true when using the proplist style configuration.
2013-09-05Fix httpd config option 'keep_alive_timeout'Johannes Weißl
The documentation states that the value is in seconds, which was true when using the Apache like configuration file, but not true when using the proplist style configuration.
2013-09-04Merge branch 'maint'Fredrik Gustafsson
2013-09-04Merge branch 'weisslj/httpd_add_script_tests/OTP-11260' into maintFredrik Gustafsson
* weisslj/httpd_add_script_tests/OTP-11260: Test nocache option of mod_cgi and mod_esi
2013-09-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-03inets: Add stronger RSA test-keysIngela Anderton Andin
The ones provided will fail inets test cases as default ssl will negotiate stronger cipher suites now that will fail the with the weak keys.
2013-09-02Test nocache option of mod_cgi and mod_esiJohannes Weißl
Tests that the nocache options work and can be used independently from each other. This was broken before c8ef69c. Conflicts: lib/inets/test/httpd_basic_SUITE.erl
2013-08-23Merge branch 'maint'Fredrik Gustafsson
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 'maint'Fredrik Gustafsson
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-21Update release notesErlang/OTP
2013-08-21inets: added simple testcase for option erl_script_nocacheFredrik Gustafsson
2013-08-21[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel ↵Fredrik Gustafsson
added as option to inets conf file
2013-08-08Merge branch 'maint'Fredrik Gustafsson
2013-08-07fix: typo, inets/doc/src/httpdtomaon
2013-07-30Merge branch 'maint'Fredrik Gustafsson
2013-07-24Fix some errors in the inets documentationJohannes Weißl
2013-07-12Merge branch 'maint'Fredrik Gustafsson
2013-07-11Add missing brackets to report formatting on ftp_progress process exitArtur Wilniewczyc
When progress reporting process exits, ftp client crashes because of missing brackets in io_lib:format argument.
2013-07-01Merge branch 'maint'Fredrik Gustafsson
2013-07-01Merge branch 'maint-r16' into maintFredrik Gustafsson
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-07-01Merge branch 'maint'Fredrik Gustafsson
2013-07-01Merge branch 'jwh/httpc_delete_body/OTP-11190' into maintFredrik Gustafsson
* jwh/httpc_delete_body/OTP-11190: httpc: Allow content body in DELETE requests
2013-06-28Update release notesErlang/OTP
2013-06-28inets: version updatesFredrik Gustafsson
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-06-18Merge tag 'OTP_R16B01'Björn-Egil Dahlberg
The R16B01 release Conflicts: lib/sasl/vsn.mk
2013-06-17Prepare releaseOTP_R16B01Erlang/OTP
2013-06-14httpc: Allow content body in DELETE requestsJames Wheare
2013-06-12Merge branch 'maint'Björn-Egil Dahlberg
2013-06-12Update copyright yearsBjörn-Egil Dahlberg
2013-05-29Merge branch 'maint'Fredrik Gustafsson
2013-05-29Merge branch 'md/httpc-stream-once-fix/OTP-11122' into maintFredrik Gustafsson
* md/httpc-stream-once-fix/OTP-11122: Remove http_chunk:decode/4 as it is no longer used Fix {stream, {self, once}} in httpc
2013-05-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
Conflicts: bootstrap/lib/stdlib/ebin/beam_lib.beam lib/public_key/test/erl_make_certs.erl
2013-05-24crypto, public_key & ssl: Make more functions accept integer keysSverker Eriksson
2013-05-22crypto,ssh, netconf, inets: binary_to_integer -> bytes_to_integerIngela Anderton Andin
2013-05-20Remove http_chunk:decode/4 as it is no longer usedMasatake Daimon
http_chunk:decode/4, the side-effecting chunk decoder, was only used by httpc_handler:handle_http_body/2 but now it's completely unused.
2013-05-20Fix {stream, {self, once}} in httpcMasatake Daimon
Previously the only difference between {stream, self} and {stream, {self, once}} was an extra Pid in the stream_start message due to a bug in httpc_handler. It was immediately sending a bunch of messages till the end instead of waiting for httpc:stream_next/1 being called.
2013-05-20ssl, public_key & inets: Remove use of deprecated crypto functions fromIngela Anderton Andin
test code
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 10:37:17 +0000