summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare releasemaint-r15Erlang/OTP2015-07-014-3/+51
|
* Merge branch 'ia/ssh/backport/OTP-12884' into maint-r15Erlang/OTP2015-07-0146-2989/+2647
|\ | | | | | | | | | | * ia/ssh/backport/OTP-12884: ssh: Fix test case issue ssh: Use old crypto with newer ssh
| * ssh: Fix test case issueIngela Anderton Andin2015-07-011-2/+2
| | | | | | | | | | The test case is not prepared to receive is_dir messages, and the same line is commented out in 18.
| * ssh: Use old crypto with newer sshIngela Anderton Andin2015-06-2645-2987/+2645
| | | | | | | | | | | | Many issues with previous process design, causing for instance process leaks, are compleatly gone in the redesigned ssh-3.0 and later. This is a backport of newer ssh design to R15B
* | Merge branch 'ia/inets/maint-15/fd/OTP-12874' into maint-r15Erlang/OTP2015-07-015-20/+40
|\ \ | |/ |/| | | | | | | | | * ia/inets/maint-15/fd/OTP-12874: ssl: Fix appup inets: Prepare for release inets: Fix broken fd feature
| * ssl: Fix appupIngela Anderton Andin2015-07-012-7/+7
| |
| * inets: Prepare for releaseIngela Anderton Andin2015-07-012-5/+5
| |
| * inets: Fix broken fd featureIngela Anderton Andin2015-07-011-8/+28
|/ | | | | | | | | | | If a wrapper script is used to open a privileged port before starting erlang and supplied as a init argument to erlang it should override the port configured by the httpd config file. Some of the code handling this was lost, in the commit da3797589463002f28fc42ef27872650fe1de938, due to missing tests of this functionality. This commit adds the code for this in a better place. In 18 also add a test.
* Update release notesErlang/OTP2015-03-131-1/+19
|
* Merge branch 'ia/ssl/maint15/poodle' into maint-r15Erlang/OTP2015-03-1310-196/+203
|\ | | | | | | | | | | | | * ia/ssl/maint15/poodle: ssl: Special Poodle protection version for OTP-R15 track ssl: Check that negotiated version is a supported version. ssl: Renable padding check
| * ssl: Special Poodle protection version for OTP-R15 trackIngela Anderton Andin2015-03-132-9/+3
| |
| * ssl: Check that negotiated version is a supported version.Ingela Anderton Andin2015-03-136-25/+76
| | | | | | | | | | | | Conflicts: lib/ssl/src/ssl_handshake.erl lib/ssl/test/ssl_basic_SUITE.erl
| * ssl: Renable padding checkIngela Anderton Andin2015-03-132-162/+124
|/
* Prepare releaseErlang/OTP2014-02-052-2/+18
|
* Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15Erlang/OTP2014-02-05222-11236/+13739
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits) Changed to correct errorcode in testcase inets: Prepare for release inets: Make test suites independent of each other inets: Rewrite of test case to avoid timing issues in test code Add missing brackets to report formatting on ftp_progress process exit inets: Remove log message as it causes more harm than use at the moment inets: Mend broken max_clients check inets: Start CT'ify httpd_SUITE inets: Remove use of default gen_server timeout Fix http_request:http_headers/1 to send content-length when length is zero Fix httpd config option 'keep_alive_timeout' Fix httpd config option 'script_timeout' inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail inets: Add crypto start check to ssl test cases ftp: fix sockname dialyzer warning including ftp:sockname/1 bug ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ...
| * Changed to correct errorcode in testcaseFredrik Gustafsson2014-02-051-1/+1
| |
| * inets: Prepare for releaseIngela Anderton Andin2014-02-051-2/+2
| |
| * inets: Make test suites independent of each otherIngela Anderton Andin2014-02-051-2/+3
| |
| * inets: Rewrite of test case to avoid timing issues in test codeIngela Anderton Andin2014-02-051-73/+75
| | | | | | | | | | | | Conflicts: lib/inets/test/httpd_SUITE.erl
| * Add missing brackets to report formatting on ftp_progress process exitArtur Wilniewczyc2014-02-051-1/+1
| | | | | | | | | | When progress reporting process exits, ftp client crashes because of missing brackets in io_lib:format argument.
| * inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin2014-02-051-4/+1
| | | | | | | | | | | | Conflicts: lib/inets/src/http_lib/http_request.erl
| * inets: Mend broken max_clients checkIngela Anderton Andin2014-02-0514-639/+526
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/inets/src/http_server/httpd_manager.erl Conflicts: lib/inets/test/inets_sup_SUITE.erl
| * inets: Start CT'ify httpd_SUITEIngela Anderton Andin2014-02-05136-2429/+3860
| | | | | | | | | | | | Conflicts: lib/inets/test/httpd_SUITE.erl
| * inets: Remove use of default gen_server timeoutIngela Anderton Andin2014-02-053-379/+31
| | | | | | | | | | | | If you need a timeout between client and server use a server side timeout instead of the default gen_server:call/2 timeout that is quite useless. Also remove legacy code that has no further use.
| * Fix http_request:http_headers/1 to send content-length when length is zeroCA Meijer2014-02-052-9/+24
| | | | | | | | | | | | | | | | In R16B01, the http_request:http_headers/1 function removes the content-length field from the HTTP headers if the content length is zero. This results in some (perhaps many) HTTP servers rejecting POSTs and PUTs without data with a 411 status word. From RFC2616, section 14.13: "Any Content-Length greater than or EQUAL to zero is a valid value".
| * Fix httpd config option 'keep_alive_timeout'Johannes Weißl2014-02-051-0/+2
| | | | | | | | | | | | 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.
| * Fix httpd config option 'script_timeout'Johannes Weißl2014-02-052-6/+6
| | | | | | | | | | | | | | | | | | 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.
| * inets: Restore ftp test files for the inets_{,sup_}SUITE to not failHans Nilsson2014-02-053-0/+1694
| |
| * inets: Add crypto start check to ssl test casesIngela Anderton Andin2014-02-051-0/+9
| |
| * ftp: fix sockname dialyzer warning including ftp:sockname/1 bugHans Nilsson2014-02-051-3/+3
| |
| * ftp,ssl: Fixes broken type link (ssloption).Hans Nilsson2014-02-052-2/+2
| |
| * ftp: Adds dynamic cert generation to tests.Hans Nilsson2014-02-051-5/+23
| |
| * ftp: Clean Makefile and conf fileHans Nilsson2014-02-052-20/+8
| |
| * ftp: Linking rfc-refs.Hans Nilsson2014-02-051-4/+4
| |
| * ftp: Add documentation.Hans Nilsson2014-02-051-1/+1
| |
| * ftp: delete old test filesHans Nilsson2014-02-0517-3958/+0
| | | | | | | | | | | | Conflicts: lib/inets/test/ftp_suite_lib.erl
| * ftp: small fixesHans Nilsson2014-02-052-45/+40
| |
| * ftp: Add ftps documentationHans Nilsson2014-02-051-3/+5
| |
| * ftp: Add timeouts to ssl:connectHans Nilsson2014-02-051-9/+11
| |
| * ftps: workingHans Nilsson2014-02-053-140/+156
| |
| * .Hans Nilsson2014-02-051-0/+1
| |
| * added some printoutsHans Nilsson2014-02-051-13/+23
| |
| * ftp: towards a working ftps, chapter 1Hans Nilsson2014-02-052-31/+37
| |
| * ftp: old ftp_SUITE re-written and worksHans Nilsson2014-02-052-11/+723
| |
| * ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin2014-02-051-0/+9
| |
| * ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin2014-02-056-230/+397
| |
| * [eldap, inets]: fix testcases when ssl not is presentFredrik Gustafsson2014-02-052-46/+160
| | | | | | | | | | | | Conflicts: lib/eldap/test/eldap_basic_SUITE.erl
| * [inets/httpd] Improved request handler terminate error-log entryMicael Karlberg2014-02-051-1/+4
| | | | | | | | | | | | | | If a request handler terminates abnormally (terminate reason not normal), the error-log entry was a bit obtuse ("Internal Server Error"). This has been improved so that the log entry now also include the actual terminate reason.
| * [inets/httpd] Improved access log entryMicael Karlberg2014-02-052-5/+12
| | | | | | | | Sometimes the size of a response could be as a string.
| * [inets/httpd] Logging cleanupMicael Karlberg2014-02-051-2/+2
| | | | | | | | | | Remove logging when fo keep-alive connection timeout. This is a normal event (feature) not an error.