aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-01-14Merge branch 'puzza007/remove-query-reserved-word-from-emacs-mode'Henrik Nord
* puzza007/remove-query-reserved-word-from-emacs-mode: remove support for query keyword from emacs mode OTP-11568
2014-01-14Update system versionBjörn-Egil Dahlberg
2014-01-14Merge branch 'ad/ssh_expand_test'Henrik Nord
* ad/ssh_expand_test: fix calculation of variable thanks to Alexander Demidenko OTP-11566
2014-01-14wx: Fix crash when garbage collect event handlers (debugger caused seg fault)Dan Gudmundsson
wxStyledTextCtrl had no wrapper class so, because it was not detected that it had virtual destructors, thus references to it was not cleaned up on destruction. When a process dies and wx cleans up the event handlers access was made to the deleted object and caused a seg fault. Added a testcase which I thought could provoke the bug but didn't.
2014-01-14wx: Fix LDFLAGS for MacDan Gudmundsson
MacOSX min version must be applied to LDFLAGS otherwise linking with static wxWidgets libraries doesn't work.
2014-01-14Merge branch 'weisslj/fix-epmd-names-win32'Henrik Nord
* weisslj/fix-epmd-names-win32: epmd: Fix -names option on Windows OTP-11565
2014-01-14epmd: Fix -names option on WindowsJohannes Weißl
Since 3aa60cc `epmd -names` does not produce any output on Windows anymore. This patch uses fwrite() instead of write() which adds the necessary carriage returns to the output so that it is suitable for the Windows cmd.exe. A test case is added (fails on Windows without the patch).
2014-01-14Merge branch 'weisslj/fix-hipe-no-remove-comments'Henrik Nord
* weisslj/fix-hipe-no-remove-comments: hipe: Fix compilation with 'no_remove_comments' OTP-11564
2014-01-14New version number does not start with an RLukas Larsson
2014-01-14ssl: Add versions to check for sane OpenSSL version for renegotiationIngela Anderton Andin
2014-01-14Fix an erroneous specKostis Sagonas
The branch that patched this file to handle the new "named funs" added an extra argument to the main function of the module but forgot to update its spec.
2014-01-14Don't make gzio.c dependent on the zutil.h header fileBjörn Gustavsson
gzio.c is our own replacement for zlib's gzopen() etc (based on a version of gzio.c that was included in an old version of zlib). Unfortunately, gzio.c still depends on the *internal* zlib header file zutil.h which is not supposed to be used outside of the zlib source code. The dependencies are the use of the gzFile typedef and the F_OPEN() macro. Instead of gzFile, define and use our own ErtsGzFile. To get rid of the F_OPEN() macro, call open() of _wfopen() directly.
2014-01-14Update zlib to 1.2.8Björn Gustavsson
2014-01-13Merge branch 'rickard/otp-17-vsn-fix'Rickard Green
* rickard/otp-17-vsn-fix: Fix issues with new versioning
2014-01-13inets: Prepare for releaseIngela Anderton Andin
2014-01-13crypto: selective support for GF2m curvesAndreas Schultz
Newer OpenSSL versions allow to selectively disable GF2m elliptic curves. Selectively enable GF2m curves is support for them is available.
2014-01-13ssl: add brainpool elliptic curves to TLS (RFC-7027)Andreas Schultz
2014-01-13public_key: add brainpool elliptic curves (RFC-5639)Andreas Schultz
2014-01-13crypto: document ec_curves/0 and ec_curve/1Andreas Schultz
2014-01-13crypto: add brainpool (RFC 5639) curvesAndreas Schultz
RFC-5649, Section 1, documents the advantages that these curves might have over others (ANSI, SEC1/2)
2014-01-13crypto: move elitic curve definitions from OpenSSL built-ins to ErlangAndreas Schultz
Decouple eliptic curve definition from OpenSSL and define them in Erlang.
2014-01-13crypto: add ECDH test vectors for more curvesAndreas Schultz
Vectors have been taken from NIST's CRYPTOGRAPHIC ALGORITHM VALIDATION PROGRAM (CAVP) (http://csrc.nist.gov/groups/STM/cavp/)
2014-01-13inets: Remove log message as it causes more harm than use at the momentIngela Anderton Andin
2014-01-13Merge branch 'lukas/erts/win-icon/OTP-11560'Lukas Larsson
* lukas/erts/win-icon/OTP-11560: erts: Update windows erlang icon
2014-01-13Merge branch 'lukas/erts/fix_sp_usage_printout/OTP-11559'Lukas Larsson
* lukas/erts/fix_sp_usage_printout/OTP-11559: erts: Replace tab with space for proper alignment
2014-01-10fix indentation error from scan-sexp in erlang.elSteve Vinoski
Fix an indentation error being returned by scan-sexp, and add a new indentation test case for the error.
2014-01-10Merge branch 'lukas/erts/fd0_pipe_bug/OTP-11558'Lukas Larsson
* lukas/erts/fd0_pipe_bug/OTP-11558: erts: Make sure fds 0,1 and 2 are open
2014-01-10erts: Make sure fds 0,1 and 2 are openLukas Larsson
If they are not open a really nasty race where the io pipe in erl_poll got fd 0 and the fd_driver setting fd 0 to blocking could occur. This caused the emulator to hang during shutdown.
2014-01-10erts: Run binary_SUITE:trapping even for 32bitSverker Eriksson
Not sure why it was disabled for 32bit in the first place?
2014-01-10inets: Mend broken max_clients checkIngela Anderton Andin
Conflicts: lib/inets/src/http_server/httpd_manager.erl
2014-01-10erts: Extend binary_SUITE:ttb_trap to also cover binary_to_termSverker Eriksson
and rename it 'trapping'.
2014-01-10erts: Remove the extra_root feature from the process structureSverker Eriksson
as we don't use it and instead have the feature to disable GC during trapping BIFs.
2014-01-10erts: Simplify term_to_binary by removing saved ESTACK from root setSverker Eriksson
We disabled GC (in 522a29666088d5) during trapping and don't need to include the saved ESTACK as part of root set.
2014-01-10erts: Replace tab with space for proper alignmentLukas Larsson
2014-01-10inets: Start CT'ify httpd_SUITEIngela Anderton Andin
2014-01-10Fix etop trace handler in smp environmentPéter Gömöri
There could be multiple processes scheduled to run
2014-01-10Include ctype.h in odbcserver.c for tolower()Anthony Ramine
odbcserver.c:2772:12: warning: implicit declaration of function 'tolower' is invalid in C99 [-Wimplicit-function-declaration] str[i] = tolower(str[i]); ^
2014-01-10Remove support for query keyword from emacs modePaul Oliver
2014-01-10fix calculation of variableHenrik Nord
thanks to Alexander Demidenko
2014-01-10hipe: Fix compilation with 'no_remove_comments'Johannes Weißl
To reproduce the error: $ echo '-module(hello).' > hello.erl $ erl 1> c(hello, [native,{hipe,[no_remove_comments]}]). [...] <HiPE (v 3.10.2.1)> Error: [hipe:834]: ERROR: {{case_clause, {icode_comment,call_ext_only}}, [{hipe_icode,successors,1, [{file,"hipe_icode.erl"}, {line,1444}]}, [...]
2014-01-10Add missing default value for regexps in reltoolHåkan Mattsson
It caused a function clause in lists:sort/1: reltool_server_SUITE.erl(2512): <ERROR> Not matching actual result was: {error, {function_clause, [{lists,sort, [[{regexp,"^priv", {re_pattern,0,1, <<69,82,67,80,64,0,0,0,16,8,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,93,0,12,25,27,112,27,114,27,105,27,118,84, 0,12,0>>}}| undefined]], [{file,"lists.erl"},{line,465}]}, {reltool_server,decode,2,[{file,"reltool_server.erl"},{line,1499}]}, {reltool_server,decode,2,[{file,"reltool_server.erl"},{line,1363}]}, {reltool_server,read_config,2, [{file,"reltool_server.erl"},{line,1335}]}, {reltool_server,parse_options,4, [{file,"reltool_server.erl"},{line,224}]}, {reltool_server,do_init,1,[{file,"reltool_server.erl"},{line,154}]}, {reltool_server,init,1,[{file,"reltool_server.erl"},{line,133}]}, {proc_lib,init_p_do_apply,3,[{file,"proc_lib.erl"},{line,239}]}]}} Expected { ok , _ }
2014-01-10Adapted reltool test server to common test usage of tc_statusHåkan Mattsson
2014-01-10Add support for the separate tinfo library from ncursesDirkjan Ochtman
Recent versions of ncurses can be built with terminfo symbols moved into the separate tinfo library. This patch prevents erts configure from dying by adding the tinfo library to list of termcap lib candidates.
2014-01-10Handle binary input in console helpersJosé Valim
The standard_input may be set to binary mode via io:getopts/2 and in case such cases the "i/0" console helper got stuck as it was unable to match new lines in binaries.
2014-01-09erts: Increase gc tenure rateBjörn-Egil Dahlberg
The garbage collector tries to maintain the previous heap block size during a minor gc, i.e. 'need' is not utilized in determining the size of the new heap, instead it relies on tenure and garbage to be sufficiently large. In instances during intense growing with exlusively live data on the heap coupled with delayed tenure, fullsweeps would be triggered directly after a minor gc to make room for 'need' since the new heap would be full. To remedy this, the tenure of terms on the minor heap will always happen (if it is below the high watermark) instead of every other minor gc.
2014-01-09erts: Update etp-commands with heap-dumpBjörn-Egil Dahlberg
2014-01-09Fix issues with new versioningRickard Green
2014-01-09erts/zlib: Remove unused file example.cBjörn Gustavsson
2014-01-09Merge branch 'sv/faster-orddict-from_list/OTP-11552'Björn Gustavsson
* sv/faster-orddict-from_list/OTP-11552: improve performance for orddict:from_list/1
2014-01-09Merge branch 'nox/fix-dbg_ieval-exporting-rules/OTP-11553'Björn Gustavsson
* nox/fix-dbg_ieval-exporting-rules/OTP-11553: compiler tests: Test exporting rules for andalso/orelse Fix evaluation of andalso and orelse in the debugger