aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
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-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-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
2014-01-22Merge branch 'bjorn/asn1/optimizations/OTP-11573'Björn Gustavsson
* bjorn/asn1/optimizations/OTP-11573: Optimize code surrounding calls to complete/1 asn1ct_imm: Add the intermediate instruction {list,List,Dst} Generate intermediate code that is easier to optimize asn1ct_imm: Add the {set,{var,Src},{var,Dst}} instruction Keep type information in the apply intermediate instruction asn1ct_imm: Add a field for intermediate code for call_gen Introduce asn1ct_gen:open_output_file/1 Factor out printing of verbose messages Improve optimization of alignment for encoding Improve construction of {cons,H,T} instructions Teach asn1ct_func:call_gen/4 to quote the generated function name Test open types that may need more than 128 bytes
2014-01-22ssl: Incorrect inputed cipherlist lead server to think that the clientIngela Anderton Andin
did not support secure renegotiation
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-skel-indent' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-sexp-error' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-fun-arity' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-error-fixes' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge branch 'dgud/test_unicode/OTP-10877'Dan Gudmundsson
* dgud/test_unicode/OTP-10877: sasl test: Quote executable paths (can contain spaces) rt_tools: Handle unicode chars in printouts kernel: code_SUITE fix unicode option Fix (unicode) debug info in test cases stdlib: Fix format if module resides in a unicode directory Fix testing with unicode paths test_server: Fix ts write unicode in config files
2014-01-21Merge branch 'hans/ssh/unicode/OTP-10953'Hans Nilsson
2014-01-21ssh: prepare vsn.mk for releaseHans Nilsson
2014-01-21ssh: minor doc correction about unicodeHans Nilsson
2014-01-21Merge branch 'maint'Magnus Lidén
2014-01-21Smoke test erl_syntax:revert/1Anthony Ramine
This tries to make bugs like 87156887b7d82a2db53f60441a4af87034cb8789 not happen again. The new test takes each file in the stdlib app, passes their forms through the erl_syntax representation, reverts them and compiles them.
2014-01-21Fix reverting of local implicit funs in erl_syntaxAnthony Ramine
This partially reverts 290dc2b08a2f92157ac5358fba815f4dbb32f8f2 in which implicit funs were mistakenly thought to be using abstract terms for their name and arity.
2014-01-21Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-01-21Merge branch 'maint'Magnus Lidén
2014-01-21[xmerl] Fix problem with header of next XML document is in the bufferLars Thorsen
when using xmerl_sax_parser:stream/2 function.
2014-01-21[xmerl] Fix bug in SAX parser when next doc start in the same bufferLars Thorsen
2014-01-21ssh: Update documentationHans Nilsson
2014-01-21ssh: Adds uncode test suiteHans Nilsson
2014-01-21ssh: Adds unicodeHans Nilsson
2014-01-21wx: Refactor C++ codeDan Gudmundsson
Try to clean up the files a bit
2014-01-21wx: Add init_dialog eventDan Gudmundsson
It was missing.
2014-01-21Update iconsDan Gudmundsson
Some png libs can not read the old images for some reason.
2014-01-21wx: Update icons to plain old white onesDan Gudmundsson
This is the (original logo) icon used on windows (werl).
2014-01-21Merge branch 'maint'Dan Gudmundsson
2014-01-21Merge branch 'dgud/wx/more-fixes/OTP-11444' into maintDan Gudmundsson
* dgud/wx/more-fixes/OTP-11444: wx: Fix hanging wx calls Update wx build instsructions for Darwin wx: Remove compiler option -fomit-frame-pointer on Darwin wx: Fix crash when garbage collect event handlers (debugger caused seg fault) wx: Fix LDFLAGS for Mac
2014-01-21Merge branch 'ia/ssl/openssl-reneogtiation-bug'Ingela Anderton Andin
* ia/ssl/openssl-reneogtiation-bug: ssl: Add versions to check for sane OpenSSL version for renegotiation
2014-01-21Merge branch 'maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maintIngela Anderton Andin
* ia/inets/httpd-manager-improvments/OTP-11557: inets: Prepare for release inets: Remove log message as it causes more harm than use at the moment inets: Mend broken max_clients check inets: Start CT'ify httpd_SUITE inets: Remove use of default gen_server timeout
2014-01-21Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/odbc/configure/OTP-11574' into maintIngela Anderton Andin
* ia/odbc/configure/OTP-11574: odbc: Fix configure check to work proparly on windows