aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-01-27Merge branch 'bjorn/compiler/fix-crash/OTP-11610'Björn Gustavsson
* bjorn/compiler/fix-crash/OTP-11610: beam_except: Eliminate compiler crash
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-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 branch 'blt/doc_language_improvement'Henrik Nord
* blt/doc_language_improvement: Clean up some awkward wording around the +spp flag. OTP-11607
2014-01-24Merge branch 'zaa/docfix'Henrik Nord
* zaa/docfix: Typo fix OTP-11606
2014-01-24Merge tag 'OTP_R16B03-1'Magnus Lidén
The R16B03-1 release
2014-01-24Merge branch 'rickard/load_balance/OTP-11385'Rickard Green
* rickard/load_balance/OTP-11385: Disable scheduler utilization balancing if +scl true is passed
2014-01-24Disable scheduler utilization balancing if +scl true is passedRickard Green
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-24Merge branch 'rickard/load_balance/OTP-11385'Rickard Green
* rickard/load_balance/OTP-11385: Add support for scheduler utilization balancing
2014-01-23Merge branch 'rickard/default_acul/OTP-11604'Rickard Green
* rickard/default_acul/OTP-11604: erts: Use "+Muacul de" as default
2014-01-23Add support for scheduler utilization balancingRickard Green
For more information see documentation of the new command line argument +sub
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/system-flag-warn-msg'Henrik Nord
* vinoski/system-flag-warn-msg: fix system_flag deprecation warnings OTP-11602
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-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-21Skip sys_erl_flagsMagnus Lidén
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-21Merge branch 'nox/fix-OTP-11506' into maintMagnus Lidén
* nox/fix-OTP-11506: Smoke test erl_syntax:revert/1 Fix reverting of local implicit funs in erl_syntax
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-21Merge branch 'lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551' into maintMagnus Lidén
* lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551: [xmerl] Fix problem with header of next XML document is in the buffer when using xmerl_sax_parser:stream/2 function. [xmerl] Fix bug in SAX parser when next doc start in the same buffer
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-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
2014-01-21Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin