aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-02-24ssh: increase timetrap for test on slow machineHans Nilsson
2017-02-20Merge branch 'hans/ssh/iolist_on_unicode/ERL-364/OTP-14230' into maintHans Nilsson
2017-02-20Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-02-20Merge branch 'hans/ssh/sftpd_fixes/OTP-14225' into maintHans Nilsson
2017-02-17ssh: replace byte-only function with element-size agnosticHans Nilsson
An error report on ssh_cli pointed to a usage of erlang:iolist_size/1. It is replaced by a specialized function.
2017-02-17ssh: increase timetrap in ssh_to_openssh_SUITE to not interrupt some slow ↵Hans Nilsson
machines
2017-02-17Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'ssh_sftpd_cwd_with_root' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
2017-02-17Merge branch 'hans/ssh/try_sftp_access_outside_root' into ↵Hans Nilsson
hans/ssh/sftpd_fixes/OTP-14225
2017-02-16Merge branch 'hans/ssh/ssh_acceptor_bug/OTP-14108' into maintHans Nilsson
2017-02-16Merge branch 'hans/public_key/ssh_fingerprint_algorithm_list/OTP-14223' into ↵Hans Nilsson
maint
2017-02-16Merge branch 'sverker/enif_send-noproc-fix/OTP-14229' into maintSverker Eriksson
* sverker/enif_send-noproc-fix: erts: Fix enif_send from noproc and no msg_env
2017-02-16Merge branch 'sverker/include-module-literal-size/OTP-14228' into maintSverker Eriksson
* sverker/include-module-literal-size: erts: Add size of literals to module code size
2017-02-16Merge branch 'sverker/round-bug/OTP-14227' into maintSverker Eriksson
* sverker/round-bug/OTP-14227: erts: Fix round/1 for large floats
2017-02-16Merge branch 'lars/xmerl/standard-namespace-problem/OTP-14139' into maintLars Thorsen
* lars/xmerl/standard-namespace-problem/OTP-14139: [xmerl] Correct handling of implicit XML namespace
2017-02-15ssh: handle return values and exceptions from ssh_acceptor:handle_connectionHans Nilsson
2017-02-15ssh: More exact test for is_tcp_socketHans Nilsson
2017-02-15ssh: Add error case for bad socketHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: speling errorHans Nilsson
2017-02-15ssh: reword documentationHans Nilsson
2017-02-15[xmerl] Correct handling of implicit XML namespaceLars Thorsen
The namespace_conformant option did not work when parsing documents without explicit XML namespace declaration.
2017-02-15Return correct state in the case of failureKarolis Petrauskas
2017-02-14ssh: allow a list of fingerprint algos in silently_accept_hosts optionHans Nilsson
2017-02-14public_key: generate a list of ssh fingerprints on requestHans Nilsson
2017-02-14Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-02-14erts: Fix round/1 for large floatsSverker Eriksson
1> round(6209607916799025.0). 6209607916799026 Problem: Adding/subtracting 0.5 and large double floats between (1 bsl 52) and (1 bsl 53) does not give reliable results. Solution: Use round() function in math.h.
2017-02-14ssh: new test - try access outside sftp treeHans Nilsson
2017-02-14Merge branch 'ingela/ssl/handshake-match/ERL-347/OTP-14222' into maintIngela Anderton Andin
* ingela/ssl/handshake-match/ERL-347/OTP-14222: ssl: Test case robustness ssl: Avoid SSL/TLS hello format confusion
2017-02-13ssl: Test case robustnessIngela Anderton Andin
2017-02-12Check for directory with correct pathKarolis Petrauskas
When opening file in the ssh_sftpd, directory check should be performed on the server's file tree.
2017-02-12Fix relative path handling in sftpdKarolis Petrauskas
Relative path handling fixed to allow opening a file by a path relative to the current working directory.
2017-02-12Consider root_dir and cwd in ssh_sftpd, if both are providedKarolis Petrauskas
The SFTPD server should use root_dir and cwd when resolving file paths, if both are provided. The root directory should be used for resolving absolute file names, and cwd should be used for resolving relative paths.
2017-02-10Merge branch 'maint-r15' into maintIngela Anderton Andin
2017-02-09Merge branch 'hasse/stdlib/shell_tab_compl/ERL-352/OTP-14200' into maintHans Bolinder
* hasse/stdlib/shell_tab_compl/ERL-352/OTP-14200: stdlib: Improve Erlang shell's tab-completion of long names
2017-02-09Merge branch 'siri/systools/warnings_as_errors-return/OTP-14170' into maintSiri Hansen
* siri/systools/warnings_as_errors-return/OTP-14170: [systools] Fix return value for warnings_as_errors + silent
2017-02-09Merge branch 'maint-r16' into maintRaimo Niskanen
2017-02-09Merge branch 'maint-r16b02' into maint-r16maint-r16Raimo Niskanen
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2017-02-09Merge branch 'maint-r15' into maintIngela Anderton Andin
2017-02-09Merge pull request #1333 from lepoetemaudit/observer-term-error-spellingBjörn Gustavsson
Fix observer term conversion error spelling
2017-02-09Merge pull request #1336 from bjorng/bjorn/travis-less-verboseBjörn Gustavsson
Reduce size of the log file for Travis CI
2017-02-09Merge pull request #1334 from bjorng/bjorn/extend-smoke-testBjörn Gustavsson
Include more otp_SUITE tests cases in the smoke test
2017-02-09Merge branch 'hasse/dialyzer/correct_plt_tests' into maintHans Bolinder
* hasse/dialyzer/correct_plt_tests: dialyzer: Correct PLT tests
2017-02-08Reduce size of the log file for Travis CIBjörn Gustavsson
The huge log files are problematic. Add shell scripts that captures the log output to a temporary file and only display the log file if an error occurs.
2017-02-08stdlib: Improve Erlang shell's tab-completion of long namesHans Bolinder
2017-02-08Include more otp_SUITE tests cases in the smoke testBjörn Gustavsson
For the benefit of Travis CI, include more test cases from otp_SUITE in the smoke test. That will avoid having to run a pull request through the daily builds to find those kind of minor issues.
2017-02-08ssh: modify ssh_algorithms_SUITE:init_per_suite for some Windows hangningHans Nilsson
2017-02-08Fix observer term conversion error spellingDave Jeffrey
In the observer UI, when inspecting state, the error given when attempting to convert a bad term contains a spelling mistake.
2017-02-08Merge pull request #1282 from leoliu/maintDan Gudmundsson
[tools] Update erlang-edoc.el to include param and returns OTP-14217
2017-02-08Merge branch 'maint-19' into maintRaimo Niskanen
Conflicts: OTP_VERSION