aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-10-05Merge branch 'lukas/erts/poll-thread/OTP-14346'Lukas Larsson
* lukas/erts/poll-thread/OTP-14346: erts: Update +IOt and msacc docs
2017-10-05Merge pull request #1567 from ↵Björn Gustavsson
bjorng/bjorn/stdlib/wildcard-escaping/ERL-451/OTP-14577 Implement escaping of special characters in wildcards
2017-10-04Implement escaping of special characters in wildcardsBjörn Gustavsson
Allow characters with special meaning to be escaped using \ (which must be writen as \\ in a string). That allows matching of filenames containing characters that are special in wildcards. This is an incompatible change, but note that the use of backslashes in wildcards would already work differently on Windows and Unix. Take for example this call: filelib:wildcard("a\\b") On Windows, filelib:wildcard/1 would look for a directory named "a", and a file or directory named "b" inside it. On Unix, filelib:wildcard/1 would look for a file named "a\\b". With this commit applied, filelib:wildcard/1 will look for a file named "ab" on both Windows and Unix. https://bugs.erlang.org/browse/ERL-451
2017-10-04Merge branch 'maint'Hans Nilsson
2017-10-04Merge branch 'hans/crypto/evp_asym_crypto/OTP-14446' into maintHans Nilsson
2017-10-04crypto: ifdef of EVP for old cryptolibs (< 1.0.0)Hans Nilsson
2017-10-04crypto: disable tests of non-working assymetric ciphersHans Nilsson
ECDSA and DSA (DSS) public/private encryption/decryption does not work
2017-10-04crypto: Added pkey_crypt_nif from PR838Hans Nilsson
Testcases for ECDSA and DSA encrypt/decrypt and some other adaptions
2017-10-04Merge branch 'maint'Hans Nilsson
2017-10-04Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson
2017-10-03ssh: Use cipher=none and mac=none in benchmarks againHans Nilsson
2017-10-03ssh: Put ssh_property_test_SUITE back in test/MakefileHans Nilsson
2017-10-03Merge branch 'maint'Hans Nilsson
2017-10-03Merge branch 'hans/ssh/ssh_dbg_hostkey/OTP-14658' into maintHans Nilsson
2017-10-03ssh: ssh_dbg reports cryptolib infoHans Nilsson
2017-10-03ssh: enable host key debugging in ssh_dbgHans Nilsson
2017-10-03ssh: Make host key checking more debug friendlyHans Nilsson
2017-10-03Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug) Conflicts: OTP_VERSION
2017-10-03Merge branch 'maint-20' into maintHans Nilsson
* maint-20: Updated OTP version Prepare release Fix zlib merge snafu ssh: fix broken printouts ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Merge branch 'maint'Sverker Eriksson
2017-10-02Merge branch 'sverker/bad-dist-msg-bug/ERIERL-80/OTP-14661' into maintSverker Eriksson
2017-10-02erts: Fix bug when detecting bad dist messageSverker Eriksson
We can't just leave it in queue with dist_ext=NULL. Two symptoms seen: 1. 'receive' trying to deref dist_ext as NULL. 2. GC think it's a term and put THE_NON_VALUE in root set.
2017-10-02Add distribution_SUITE:bad_dist_ext_sizeSverker Eriksson
2017-10-02Updated OTP versionOTP-20.1.1Erlang/OTP
2017-10-02Prepare releaseErlang/OTP
2017-10-02Merge branch 'john/erts/fix-zlib-merge/OTP-14648/OTP-14649' into maint-20Erlang/OTP
* john/erts/fix-zlib-merge/OTP-14648/OTP-14649: Fix zlib merge snafu
2017-10-02Merge branch 'hans/ssh/printout_crash/OTP-14645' into maint-20Erlang/OTP
* hans/ssh/printout_crash/OTP-14645: ssh: fix broken printouts
2017-10-02Merge branch 'bjorn/erts/match-context/ERL-490/OTP-14640' into maint-20Erlang/OTP
* bjorn/erts/match-context/ERL-490/OTP-14640: Fix incorrect internal consistency failure for binary matching code
2017-10-02Merge branch 'hans/ssh/adjust_for_peers_version/OTP-14638' into maint-20Erlang/OTP
* hans/ssh/adjust_for_peers_version/OTP-14638: ssh: exclude aes_gcm if peer is OpenSSH 6.2 (known bug)
2017-10-02Fix zlib merge snafuJohn Högberg
I accidentally merged a few fixes directly to maint-20 (and then to maint and master), instead of merging to maint and master and waiting for a patch to merge it into maint-20, leaving the related tickets dangling. This commit does nothing beyond getting the tickets (and their release notes) into the next patch.
2017-10-02Merge branch 'maint'Hans Nilsson
2017-10-02Merge branch 'hans/ssh/ecdsa_pass_phrase/OTP-14602' into maintHans Nilsson
2017-10-02ssh: add ecdsa_pass_phrase option in analogy with rsa_pass_phraseHans Nilsson
2017-10-02Merge branch 'maint'John Högberg
2017-10-02Update primary bootstrapBjörn Gustavsson
2017-10-02Merge branch 'maint-20' into maintJohn Högberg
2017-10-02Merge branch 'maint'Hans Nilsson
2017-10-02Merge pull request #1546 from michalmuskala/bs-add-optBjörn Gustavsson
Optimise size calculation for binary construction OTP-14654
2017-10-02Merge branch 'hans/public_key/verify_hostname_ip_address/OTP-14653' into maintHans Nilsson
2017-10-02public_key: verify ip (both v4 and v6)Hans Nilsson
2017-10-02public_key: Added IP4 address checks to hostname_verification testsHans Nilsson
2017-10-02Merge branch 'bjorn/erts/improve-beam-ops'Björn Gustavsson
* bjorn/erts/improve-beam-ops: Move out variables from the head of combined instructions Change operand from 'P' to 'Q' for i_apply_last and i_apply_fun_last Add CHECK_ALIGNED() for testing storage destinations instrs.tab: Add missing -no_next directives beam_load.c: Generalize the 'P' operator in the packing engine Break out most of the initialization from process_main() Eliminate the OpCode() macro Eliminate unnecessary and inconsistent casts Refactor macros for accessing Beam instructions beam_emu: Make order of macros consistent beam_SUITE: Strengthen test of packed registers
2017-10-02Merge pull request #1589 from bjorng/bjorn/erts/instruction-offsetsBjörn Gustavsson
Point out the correct line number in stack traces
2017-10-02erts: Update +IOt and msacc docsLukas Larsson
2017-10-02Merge branch 'maint'Ingela Anderton Andin
2017-10-02Merge branch 'ingela/inets-typo/ERL-492' into maintIngela Anderton Andin
* ingela/inets-typo/ERL-492: inets: Fix documentation typo
2017-10-02inets: Fix documentation typoIngela Anderton Andin
2017-10-02Merge branch 'maint'Ingela Anderton Andin
2017-10-02Merge branch 'ingela/dtls/renegotiate/OTP-14563' into maintIngela Anderton Andin
* ingela/dtls/renegotiate/OTP-14563: dtls: Compleate DTLS renegotiate implementation
2017-10-02Merge branch 'maint'Rickard Green
* maint: Don't allow null in filenames