aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-03-25Fix DTrace/SystemTap-related formattingScott Lystig Fritchie
Thanks to Michał Ptaszek for bringing this embarrassing formatting error to my attention. Many DTrace/SystemTap trace strings are incorrectly truncated at 4/8 bytes, depending on the CPU word size. This patch expands the work from commit d032e097 by zheng siyao. Michał's report to the erlang-bugs list can be found at: http://erlang.org/pipermail/erlang-bugs/2014-March/004250.html Conflicts: erts/emulator/beam/beam_emu.c erts/emulator/beam/copy.c erts/emulator/beam/dist.c erts/emulator/beam/erl_async.c erts/emulator/beam/erl_bif_port.c erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c erts/emulator/beam/io.c
2014-03-12Pass full strings to DTrace probesMichal Ptaszek
Whenever string is passed as an argument to a DTrace probe, its length should be properly computed. Until now in order to get length of the input buffer size_of(char *) was used - which evalutes to 4 or 8 (depending on the architecture). To get a proper length, size_of(DTRACE_CHARBUF_NAME(buffer_name)) should be used.
2014-02-24Merge branch 'maint-r16' into maintHans Nilsson
2014-02-24Merge branch 'hans/ssh/maint-r16/patch_1261' into maint-r16Hans Nilsson
2014-02-14fix calculation of variableHenrik Nord
thanks to Alexander Demidenko
2014-02-14ssh: The server ssh_cli does not delay tty_geometry requests in case no tty ↵Hans Nilsson
is allocated
2014-02-14ssh: fix 'known_hosts' bug in ssh_fileHans Nilsson
2014-02-14ssh: Changed order of decode clauses to temp fix decode errorHans Nilsson
2014-02-14ssh: Fixes memory crashHans Nilsson
2014-02-14Fix that result on stderr sent back to ssh:exec had length info presentHans Nilsson
2014-02-10Merge branch 'maint-r16' into maintIngela Anderton Andin
2014-02-10Merge branch 'maint-r15' into maint-r16Ingela Anderton Andin
2014-02-05Prepare releaseErlang/OTP
2014-02-05Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15Erlang/OTP
* 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. ...
2014-02-05Changed to correct errorcode in testcaseFredrik Gustafsson
2014-02-05inets: Prepare for releaseIngela Anderton Andin
2014-02-05inets: Make test suites independent of each otherIngela Anderton Andin
2014-02-05inets: Rewrite of test case to avoid timing issues in test codeIngela Anderton Andin
Conflicts: lib/inets/test/httpd_SUITE.erl
2014-02-05Add 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.
2014-02-05inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin
Conflicts: lib/inets/src/http_lib/http_request.erl
2014-02-05inets: Mend broken max_clients checkIngela Anderton Andin
Conflicts: lib/inets/src/http_server/httpd_manager.erl Conflicts: lib/inets/test/inets_sup_SUITE.erl
2014-02-05inets: Start CT'ify httpd_SUITEIngela Anderton Andin
Conflicts: lib/inets/test/httpd_SUITE.erl
2014-02-05inets: Remove use of default gen_server timeoutIngela Anderton Andin
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.
2014-02-05Fix http_request:http_headers/1 to send content-length when length is zeroCA Meijer
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".
2014-02-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.
2014-02-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.
2014-02-05inets: Restore ftp test files for the inets_{,sup_}SUITE to not failHans Nilsson
2014-02-05inets: Add crypto start check to ssl test casesIngela Anderton Andin
2014-02-05ftp: fix sockname dialyzer warning including ftp:sockname/1 bugHans Nilsson
2014-02-05ftp,ssl: Fixes broken type link (ssloption).Hans Nilsson
2014-02-05ftp: Adds dynamic cert generation to tests.Hans Nilsson
2014-02-05ftp: Clean Makefile and conf fileHans Nilsson
2014-02-05ftp: Linking rfc-refs.Hans Nilsson
2014-02-05ftp: Add documentation.Hans Nilsson
2014-02-05ftp: delete old test filesHans Nilsson
Conflicts: lib/inets/test/ftp_suite_lib.erl
2014-02-05ftp: small fixesHans Nilsson
2014-02-05ftp: Add ftps documentationHans Nilsson
2014-02-05ftp: Add timeouts to ssl:connectHans Nilsson
2014-02-05ftps: workingHans Nilsson
2014-02-05.Hans Nilsson
2014-02-05added some printoutsHans Nilsson
2014-02-05ftp: towards a working ftps, chapter 1Hans Nilsson
2014-02-05ftp: old ftp_SUITE re-written and worksHans Nilsson
2014-02-05ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2014-02-05ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2014-02-05[eldap, inets]: fix testcases when ssl not is presentFredrik Gustafsson
Conflicts: lib/eldap/test/eldap_basic_SUITE.erl
2014-02-05[inets/httpd] Improved request handler terminate error-log entryMicael Karlberg
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.
2014-02-05[inets/httpd] Improved access log entryMicael Karlberg
Sometimes the size of a response could be as a string.
2014-02-05[inets/httpd] Logging cleanupMicael Karlberg
Remove logging when fo keep-alive connection timeout. This is a normal event (feature) not an error.
2014-02-05[inets/httpd] Fixed mod_head handling of "new" responseMicael Karlberg