aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-03wx: Fix some function specificationsDan Gudmundsson
2015-12-03ssl: Add upper limit for session cacheIngela Anderton Andin
If upper limit is reached invalidate the current cache entries, e.i the session lifetime is the max time a session will be keept, but it may be invalidated earlier if the max limit for the table is reached. This will keep the ssl manager process well behaved, not exhusting memeory. Invalidating the entries will incrementally empty the cache to make room for fresh sessions entries.
2015-12-03ssl: Measure elapsed time with erlang:monotonic_timeIngela Anderton Andin
2015-12-03erts: Fix bug in heap_factory_undo for FACTORY_HEAP_FRAGS modeSverker Eriksson
Make sure a heap fragment is not deallocated before all off_heap terms have been cleared. The fix assumes/asserts that the off_heap-lists of all additional heap fragments are empty. I think this bug has been harmless as hashmap nodes, which is only ones (?) that can cause a factory to produce more heap, are not linked in off_heap-list.
2015-12-03Extend erl_lint:format_error/1 to handle bittype mismatchesBjörn Gustavsson
erl_lint:format_error/1 would crash with a function error if conflicting types were given. That was most easily noticed in the shell: Eshell V7.0.3 (abort with ^G) 1> <<0/integer-binary>>. *** ERROR: Shell process terminated! *** Noticed-by: Aleksei Magusev
2015-12-03erl_lint_SUITE: Add smoke test of format_error/1Björn Gustavsson
The test suite depended on the compiler to call erl_lint:format_error/1 to ensure that format_error/1 was covered. Unfortunately, though, if format_error/1 crashed the compiler would catch the exception so that the test suite would not notice it. Add a smoke test of format_error/1 that will crash if there is any problem with erl_lint:format_error/1.
2015-12-03Merge branch 'maint'Björn Gustavsson
* maint: BER: Fix encoding of empty named BIT STRING
2015-12-03Merge branch 'bjorn/asn1/empty-named-bit-string/OTP-13149' into maintBjörn Gustavsson
* bjorn/asn1/empty-named-bit-string/OTP-13149: BER: Fix encoding of empty named BIT STRING
2015-12-03Updated OTP versionOTP-17.5.6.5Erlang/OTP
2015-12-03Prepare releaseErlang/OTP
2015-12-03Merge branch 'ia/ssl/maint-17/backport-of-18-fix' into maint-17Erlang/OTP
* ia/ssl/maint-17/backport-of-18-fix: ssl: Prepare for release ssl: Do not crash on proprietary hash_sign algorithms
2015-12-03Merge branch 'raimo/inet-setopts-multi-raw/OTP-11482' into maint-17Erlang/OTP
* raimo/inet-setopts-multi-raw/OTP-11482: Update appup Testcase for inet:setopts/2 multiple raw options Fix inet:setopts/2 to take multiple raw options Fix error propagate from setopts
2015-12-03ssl: Prepare for releaseIngela Anderton Andin
2015-12-03Merge branch 'maint'Siri Hansen
2015-12-03Merge branch 'siri/ct_netconfc/log-silent/OTP-13035' into maintSiri Hansen
* siri/ct_netconfc/log-silent/OTP-13035: Don't attempt logging when log type is 'silent'
2015-12-03rm assertReceive, due to a leftover of a conflict resolutionZandra
c574bd33c39d91c487c3fcd819226ecfc46c13c8
2015-12-03Merge branch 'maint'Zandra
2015-12-03Merge branch 'swvist/topic/ssh-key-callback-options' into maintZandra
* swvist/topic/ssh-key-callback-options: Support SSH key callback module options OTP-13156
2015-12-02Merge branch 'egil/fix-seq_trace'Björn-Egil Dahlberg
* egil/fix-seq_trace: Fix seq_trace token copy size Fix seq_trace refactoring bug
2015-12-02Merge branch 'maint'Raimo Niskanen
2015-12-02Merge branch 'soranoba/fix-file-position/PR-646' into maintRaimo Niskanen
* soranoba/fix-file-position/PR-646: Unify internal error handling Fix file:pread and :pwrite to use character encoding Clean up code for file:position/2 Fix file:position (not raw mode) OTP-13155
2015-12-02hipe: Fix signed compares of unsigned sizesMagnus Lång
Also, some of the branches were testing sizes in bits against a constant ?MAX_BINSIZE, which was in bytes. The signed comparisons masked this mistake. These branches have been removed since all sizes in bits that fit in a machine word are valid binary sizes. Finally, a test that reproduces the issue was added to bs_construct, along with a test for one of the cases (bs_init<0>(...)) when the test against ?MAX_BINSIZE must be changed to unsigned rather than removed.
2015-12-02beam: Fix overflow bug in i_bs_add_jIdMagnus Lång
The test whether the result would fit in a smallnum could overflow into a negative number that would fit a smallnum. A test that reproduces the issue was added to bs_construct_SUITE.
2015-12-02Merge branch 'maint'Siri Hansen
2015-12-02Merge branch 'siri/ct_netconfc/clear-timer/OTP-13008' into maintSiri Hansen
* siri/ct_netconfc/clear-timer/OTP-13008: Flush timeout message from message queue when canceling timer
2015-12-01Support SSH key callback module optionsVipin Nair
This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. A module implementing the SSH key callback API is used to customize the handling of public key. This patch allows extra callback options to be passed to the module implementing the SSH callback module behaviour. The key_cb option has been changed: {key_cb, atom()} -> {key_cb, key_cb()} Where: key_cb() :: atom() | {atom(), list()} The callback options, if specified, is made available to the callback module via the options passed to it under the key 'key_cb_private'. More details and some backgorund is available here[1]. [1]: http://erlang.org/pipermail/erlang-patches/2015-November/004800.html
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'legoscia/tls_dist_options' into maintZandra
* legoscia/tls_dist_options: Test interface listen option for TLS distribution Test socket listen options for TLS distribution Test port options for TLS distribution TLS Dist: Use inet_dist_ options Conflicts: lib/ssl/src/ssl_tls_dist_proxy.erl lib/ssl/test/ssl_dist_SUITE.erl OTP-12838
2015-12-01Fix typos in ssl.xmlMagnus Henoch
2015-12-01wx: Remove call to disconnect_impl from serverDan Gudmundsson
The server might wait for the result of a call to disconnect_impl which can now be delayed, that might cause a callback to never be invoked and thus hang the driver thread. To avoid that dispatch the disconnect_impl call from user process instead of server.
2015-12-01Merge branch 'lexmag/bin-gen-pattern-bytes'Zandra
* lexmag/bin-gen-pattern-bytes: Forbid bytes modifier for unsized part of binary generator OTP-13152
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'scrapinghub/sni_with_connect' into maintZandra
* scrapinghub/sni_with_connect: inets: SNI to be passed with requests through CONNECT OTP-12985
2015-12-01Update appupRaimo Niskanen
2015-12-01crypto: Avoid bug in OpenSSL-0.9.8 for ECB ciphersSverker Eriksson
that make EVP_CIPHER_iv_length() return non-zero value. Seems to be fixed in 0.9.8m.
2015-12-01Merge branch 'maint'Ingela Anderton Andin
2015-12-01Merge branch 'ia/inets/esi-timeout/OTP-13110' into maintIngela Anderton Andin
* ia/inets/esi-timeout/OTP-13110: inets: Add warning header in "chunk trailer" when mod_esi callback times out or fails inets: Remove exit that generates an incorrect internal server error
2015-11-30Merge branch 'maint'Sverker Eriksson
Conflicts: erts/emulator/beam/erl_gc.c erl_gc.c was a dummy merge (--ours) as the bug does not exist after rewrite.
2015-11-30Merge branch 'sverk/rare-gc-map-overflow/OTP-13146' into maintSverker Eriksson
* sverk/rare-gc-map-overflow/OTP-13146: erts: Fix rare case of faulty heap fragment deallocation
2015-11-30Merge branch 'maint'Rickard Green
* maint: Remove ERTS_PRINT_INVALID from erts_print()
2015-11-30Merge branch 'rickard/erts-print/OTP-13150' into maintRickard Green
* rickard/erts-print/OTP-13150: Remove ERTS_PRINT_INVALID from erts_print()
2015-11-30Remove ERTS_PRINT_INVALID from erts_print()Rickard Green
ERTS_PRINT_INVALID prevented file descriptor 0 to be used which could cause an empty crash dump.
2015-11-30hipe: Add tests for bad bit syntax float sizesMagnus Lång
2015-11-30BER: Fix encoding of empty named BIT STRINGBjörn Gustavsson
Encoding an empty named BIT STRING would fail for BER. Noticed-by: Svilen Ivanov
2015-11-30erts: Remove unused include files from hash.cSverker Eriksson
Note that hash.c is quite "clean" from Erlang stuff and is used by erl_child_setup as well.
2015-11-30[erl_docgen] Allow br in the tag of tagged listsLars Thorsen
2015-11-30[erl_docgen] Add conversion of the i tag in the XSL specsLars Thorsen
2015-11-30[erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic).Lars Thorsen
2015-11-30[erl_docgen] Correct faults in the dtdLars Thorsen
2015-11-30Change xmllint targetLars Thorsen