aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2014-01-28ssl: use is_boolean/1 guard in option validationAndreas Schultz
2014-01-28Merge branch 'ia/conscell/odbc-mavericks/OTP-11630'Ingela Anderton Andin
* ia/conscell/odbc-mavericks/OTP-11630: fixes problem with ODBC on OS X 10.9 Mavericks
2014-01-28fixes problem with ODBC on OS X 10.9 Mavericksconscell
Since Apple has removed iODBC from the default OS X 10.9 Mavericks installation I tried to compile Erlang R16B02 with unixODBC. Even with installed unixODBC and specified --with-odbc=[path to my unixODBC] option Erlang R16B02 still uses iODBC (because Apple has left some iODBC binaries): 1> odbc:start(). ok 2> odbc:connect("",[]). {error,"[iODBC][Driver Manager]No data source or driver specified, dialog prohibited SQLSTATE IS: IM007 Connection to database failed."}
2014-01-28Merge branch 'master' of super:otpHans Nilsson
2014-01-28ssh: The server ssh_cli does not delay tty_geometry requests in case no tty ↵Hans Nilsson
is allocated
2014-01-28Merge branch 'ia/tuncer/dialyzer-fixes/OTP-11627'Ingela Anderton Andin
* ia/tuncer/dialyzer-fixes/OTP-11627: Fix incorrect type reference (inet:ipaddress() -> inet:ip_address()) Consistently format public_key(3) Fix incorrect use of public_key:private_key/0 type Fix incorrect proplists type reference
2014-01-28Fix incorrect type reference (inet:ipaddress() -> inet:ip_address())Tuncer Ayaz
2014-01-28Consistently format public_key(3)Tuncer Ayaz
When documenting public_key/0 and private_key/0, I noticed the inconsistent state of formatting in public_key(3)'s Data Types section. This should be fixed for consistency and readability.
2014-01-28Fix incorrect use of public_key:private_key/0 typeTuncer Ayaz
public_key:private_key/0 was referenced but undefined, and lib/ssl had a local definition of private_key/0. To fix that, make the following changes: * add public_key:private_key/0 type * document public_key/0 and private_key/0 * fix incorrect definitions and references
2014-01-28Fix incorrect proplists type referenceTuncer Ayaz
ssh and public_key were referring to proplists:proplists/0 which does not exist. Fix by using the correct type proplists:proplist/0.
2014-01-28Merge branch 'anders/diameter/doc/OTP-11583'Anders Svensson
* anders/diameter/doc/OTP-11583: Correct doc on the setting of Origin-State-Id
2014-01-28Merge branch 'kostis/dialyzer_dep-spec-fix'Hans Bolinder
* kostis/dialyzer_dep-spec-fix: Fix an erroneous spec
2014-01-28Merge branch 'master' of super:otpMicael Karlberg
2014-01-28Merge branch 'bmk/snmp/prep_for_r17'Micael Karlberg
2014-01-28Merge branch 'bmk/megaco/prep_for_r17'Micael Karlberg
2014-01-28Merge branch 'nox/export_all-behaviour'Hans Bolinder
* nox/export_all-behaviour: Properly handle export_all when looking for undefined callbacks
2014-01-28Correct doc on the setting of Origin-State-IdAnders Svensson
It was incorrectly stated that the AVP would be set in an outgoing DPR/DPA.
2014-01-28Merge branch 'rzezeski/rz_fix_dtrace_illumos/OTP-11622'Lukas Larsson
* rzezeski/rz_fix_dtrace_illumos/OTP-11622: Fix DTrace build on Illumos
2014-01-28Merge branch 'ia/ssl/tests'Ingela Anderton Andin
* ia/ssl/tests: ssl: Avoid test case timing issues
2014-01-28Merge branch 'anders/diameter/17.0_release/OTP-11605'Anders Svensson
* anders/diameter/17.0_release/OTP-11605: vsn -> 1.6 Remove upgrade-related code Update appup for 17.0 Avoid type gen_sctp:open_option() until it actually exists
2014-01-28Merge branch 'ia/Vagabond/adt-honor-cipher-order/OTP-11621'Ingela Anderton Andin
* ia/Vagabond/adt-honor-cipher-order/OTP-11621: Implement 'honor_cipher_order' SSL server-side option
2014-01-27Merge branch 'sverk/crypto-process-slaughter'Sverker Eriksson
OTP-11619 * sverk/crypto-process-slaughter: crypto: Remove all processes from application crypto
2014-01-27vsn -> 1.6Anders Svensson
2014-01-27Remove upgrade-related codeAnders Svensson
No longer needed to update code in runtime since the emulator is restarted at a major release.
2014-01-27Update appup for 17.0Anders Svensson
Plan to make use of the emulator restart implied by a major release to clean out some upgrade-related code.
2014-01-27Avoid type gen_sctp:open_option() until it actually existsAnders Svensson
The type's existence is the subject of OTP-11139, which has been gathering dust since R16B. http://erlang.org/pipermail/erlang-bugs/2013-September/003765.html
2014-01-27[megaco] Updated version, appup and release notesMicael Karlberg
OTP-10907
2014-01-27[snmp] Assigned proper version, updated release notes and appupMicael Karlberg
OTP-10877 OTP-10907
2014-01-2717.0 anchor and broken links fixesLukas Larsson
2014-01-27Merge branch 'lukas/erts/sendfile_passive_mode_fix/OTP-11614'Lukas Larsson
* lukas/erts/sendfile_passive_mode_fix/OTP-11614: erts: fix bug when using passive mode and sendfile
2014-01-27erts: fix bug when using passive mode and sendfileLukas Larsson
The bug incorrectly issued driver_select when un-ignoring an fd for a socket in passive mode, which caused an incorrect error tuple to be returned when the remote end closed the connection.
2014-01-27Merge branch 'dgud/wx/refactor-and-bugfixes/OTP-11586'Dan Gudmundsson
* dgud/wx/refactor-and-bugfixes/OTP-11586: wx: Delay all deletes if recursed in event loop wx: wx could hang if wxe_server died (or had died) when inside a callback wx: Delay memory cleanup until safe wx: Refactor C++ code wx: Add init_dialog event Update icons wx: Update icons to plain old white ones
2014-01-27Merge branch 'anders/diameter/sctp_streams/OTP-11593'Anders Svensson
* anders/diameter/sctp_streams/OTP-11593: Change interface for communicating outbound stream id to diameter_sctp
2014-01-27Merge branch 'anders/diameter/undefined_group/OTP-11561'Anders Svensson
* anders/diameter/undefined_group/OTP-11561: Ensure that Grouped AVP's are fully defined in dictionaries Don't format diameter_make:codec/2 errors Compiler suite fix
2014-01-27ssl: Avoid test case timing issuesIngela Anderton Andin
2014-01-24beam_except: Eliminate compiler crashBjörn Gustavsson
Code such as: bar(X) -> case {X+1} of 1 -> ok end. would crash the beam_except pass of the compiler. The reason for the crash is that the '+' operator would add a line/1 instruction that the beam_except pass was not prepared to handle. Reported-by: Erik Søe Sørensen
2014-01-24Change interface for communicating outbound stream id to diameter_sctpAnders Svensson
The module uses the transport_data field of record diameter_packet to communicate the stream on which the an incoming message is received and on which an outgoing message should be sent, the previous interface being that both are communicated as a tuple of the form {stream, Id}. However, since diameter retains the value of an incoming request's transport_data unless the corresponding answer message specifies otherwise, the behaviour in this case is to send an answer on the outbound stream with the same identifier as the that of the inbound stream on which the request was received. If the inbound stream id is greater than or equal to the number of outbound streams then this is guaranteed to fail, causing the transport process in question to terminate. There is no relationship between inbound and outbound stream identifiers so diameter_sctp's imposition of one is simply wrong. Outbound stream ids are now communicated with a different tuple: {outstream, Id}, interpreted modulo the number of outbound streams. Thus, retention of an inbound request's transport_data has no effect on the selection of an outbound stream. The change in interface is not strictly backwards compatible because of the new atom for the outbound stream. However, as there is currently no documented way of obtaining the available number of outbound streams for a peer connection, there is no way for a client to have known the range of ids from which it could reliably have chosen with the previous interface, so any setting of the outbound stream has probably been unintentional. Not explicitly specifying an outbound stream now results in a round-robin selection.
2014-01-24Merge branch 'andrewtj/atj-crypto-chiphertext-typo'Henrik Nord
* andrewtj/atj-crypto-chiphertext-typo: crypto: Fix 'ChipherText' typo in doc OTP-11609
2014-01-24Merge branch 'oliv3/fix_valgrind_warning_in_gen_challenge'Henrik Nord
* oliv3/fix_valgrind_warning_in_gen_challenge: (memcheck) Uninitialized structure in gen_challenge OTP-11608
2014-01-24Merge tag 'OTP_R16B03-1'Magnus Lidén
The R16B03-1 release
2014-01-24Prepare releaseOTP_R16B03-1Erlang/OTP
2014-01-24Merge branch 'maint'Ingela Anderton Andin
Conflicts: otp_build
2014-01-24Merge branch 'ia/ssl/secure-renegotiate/OTP-11595' into maintIngela Anderton Andin
* ia/ssl/secure-renegotiate/OTP-11595: ssl: Incorrect inputed cipherlist lead server to think that the client did not support secure renegotiation
2014-01-23wx: Delay all deletes if recursed in event loopDan Gudmundsson
Avoids crashes.
2014-01-23Merge branch 'lucafavatella/fix-doc-of-dbg-stop'Henrik Nord
* lucafavatella/fix-doc-of-dbg-stop: Correct doc of return value of dbg:{stop,stop_clear} functions OTP-11603
2014-01-23Merge branch 'vinoski/emacs-fixes'Henrik Nord
* vinoski/emacs-fixes: fix emacs erlang skeleton indentation fix indentation error from scan-sexp in erlang.el prevent errors from erlang.el fix erlang-mode erlang-get-function-arity OTP-11601
2014-01-23Properly handle export_all when looking for undefined callbacksAnthony Ramine
Reported-by: Michele Miron
2014-01-22wx: wx could hang if wxe_server died (or had died) when inside a callbackDan Gudmundsson
The pid is not available via driver_caller(..) (see wxeCommand constr) inside driver_monitor callback.
2014-01-22wx: Delay memory cleanup until safeDan Gudmundsson
Previously we could do a cleanup while we where recursed down and thus delete the objects we where invoking.
2014-01-22Merge branch 'bjorn/erts/zlib-1.2.8'Björn Gustavsson
* bjorn/erts/zlib-1.2.8: configure: Prefer the system's zlib over own our zlib source Update preloaded modules Add the 'rle' zstrategy Don't make gzio.c dependent on the zutil.h header file Update zlib to 1.2.8 erts/zlib: Remove unused file example.c