aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2015-12-07Merge branch 'maint'Hans Bolinder
* maint: doc: Fix some minor issues in Types and Function Specifications erts: Remove CDATA from The Abstract Format document erts: Correct the types section in The Abstract Format document stdlib: Correct pretty-printing of map types stdlib: Pretty-print constraints as 'V :: T' Conflicts: erts/doc/src/absform.xml
2015-12-07stdlib: Correct pretty-printing of map typesHans Bolinder
Add parentheses around annotated type union elements in map pair types. The bug was introduced in Erlang/OTP 18.0.
2015-12-07stdlib: Pretty-print constraints as 'V :: T'Hans Bolinder
Print constraints as 'V :: T' rather than 'is_subtype(V, T)'.
2015-12-04Merge branch 'maint'Henrik Nord
2015-12-04Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/src/kernel.appup.src lib/kernel/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl_cipher.erl lib/ssl/vsn.mk otp_versions.table
2015-12-04Merge branch 'maint'Lars Thorsen
2015-12-04Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maintLars Thorsen
* lars/xmllint-incorrect-errors/OTP-13026: [erl_docgen] Allow br in the tag of tagged lists [erl_docgen] Add conversion of the i tag in the XSL specs [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic). [erl_docgen] Correct faults in the dtd Change xmllint target [erl_docgen] Update DTD for anno tag
2015-12-04Merge branch 'maint'Dan Gudmundsson
* maint: wx: Fix some function specifications wx: Remove call to disconnect_impl from server wx: Add a command queue check after event sent to erlang wx: Make wxPostScriptDC optional wx: Add wxOverlay wx: Use only one ring buffer for command queue
2015-12-04Merge branch 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maintDan Gudmundsson
* dgud/wx/rewrite-cmd-loop/OTP-13160: wx: Fix some function specifications wx: Remove call to disconnect_impl from server wx: Add a command queue check after event sent to erlang wx: Make wxPostScriptDC optional wx: Add wxOverlay wx: Use only one ring buffer for command queue
2015-12-04Merge branch 'maint'Björn Gustavsson
* maint: Extend erl_lint:format_error/1 to handle bittype mismatches erl_lint_SUITE: Add smoke test of format_error/1
2015-12-04Merge branch 'bjorn/stdlib/fix-erl_lint-bugs/OTP-13157' into maintBjörn Gustavsson
* bjorn/stdlib/fix-erl_lint-bugs/OTP-13157: Extend erl_lint:format_error/1 to handle bittype mismatches erl_lint_SUITE: Add smoke test of format_error/1
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'zandra/rm-eunit-assertReceive' into maintZandra
* zandra/rm-eunit-assertReceive: rm assertReceive, due to a leftover of a conflict resolution
2015-12-03wx: Fix some function specificationsDan Gudmundsson
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-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-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 '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-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-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-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-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-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-30[erl_docgen] Update DTD for anno tagLars Thorsen
2015-11-27inets: Add warning header in "chunk trailer" when mod_esi callback times out ↵Ingela Anderton Andin
or fails Also remove legacy debug macros and add help function httpd_util:error_log/2 to avoid code duplication.
2015-11-27inets: Remove exit that generates an incorrect internal server errorIngela Anderton Andin
2015-11-27Merge branch 'maint'Hans Nilsson
* maint: Updated OTP version Update release notes ssh: vsn.mk updated ssh: New test cases for SSH_MSG_KEX_DH_GEX_REQUEST_OLD ssh: update existing testcases ssh: Improve group selection ssh: implemented server side SSH_MSG_KEX_DH_GEX_REQUEST_OLD for putty client Conflicts: OTP_VERSION
2015-11-27Merge branch 'maint-18' into maintHans Nilsson
* maint-18: Updated OTP version Update release notes ssh: vsn.mk updated ssh: New test cases for SSH_MSG_KEX_DH_GEX_REQUEST_OLD ssh: update existing testcases ssh: Improve group selection ssh: implemented server side SSH_MSG_KEX_DH_GEX_REQUEST_OLD for putty client Conflicts: lib/ssh/src/ssh_transport.erl lib/ssh/test/ssh_protocol_SUITE.erl lib/ssh/vsn.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 04:40:40 +0000