aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-03Merge branch 'egil/opt-list_to_binary/OTP-11082'Björn-Egil Dahlberg
* egil/opt-list_to_binary/OTP-11082: erts: Use fast path for list_to_binary([Bin]) case
2013-05-03Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/stdlib/ebin/epp.beam
2013-05-03Update primary bootstrapFredrik Gustafsson
2013-05-03Merge branch 'nox/fix-epp-file-attrs/OTP-11079' into maintFredrik Gustafsson
* nox/fix-epp-file-attrs/OTP-11079: Fix an inconsistent state in epp
2013-05-02Merge branch 'maint'Patrik Nyblom
2013-05-02Merge branch 'maint-r16' into maintPatrik Nyblom
2013-05-02Merge branch 'maint-r15' into maint-r16Patrik Nyblom
2013-05-02Merge branch 'maint'Fredrik Gustafsson
2013-05-02Update primary bootstrapFredrik Gustafsson
2013-05-02Merge branch 'nox/lists-filtermap/OTP-11078' into maintFredrik Gustafsson
* nox/lists-filtermap/OTP-11078: Rename and document lists:zf/2 as lists:filtermap/2
2013-05-02Merge branch 'maint'Fredrik Gustafsson
2013-05-02Merge branch 'fredrik/common_test/wait_for_linebreak_doc' into maintFredrik Gustafsson
* fredrik/common_test/wait_for_linebreak_doc: Added further doc common_test: Added documentation for wait_for_linebreak option
2013-05-02Merge branch 'maint'Siri Hansen
2013-04-30erts: Use fast path for list_to_binary([Bin]) caseBjörn-Egil Dahlberg
A common case is to wrap an argument to list_to_binary in a list to ensure conversion can happen even though the argument may already be a binary. Use fast path for this case.
2013-04-30Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [jinterface] Extend timetrap timers in nc_SUITE and jinterface_SUITE [jinterface] Set max heap size for jvm when running echo_server [jinterface] Clean up hanging java nodes after each test case
2013-04-30Rename and document lists:zf/2 as lists:filtermap/2Anthony Ramine
This function is used all over the place in OTP itself and people sometimes want that functionality, they may as well not reimplement it themselves.
2013-04-30Added further docFredrik Gustafsson
2013-04-30common_test: Added documentation for wait_for_linebreak optionFredrik Gustafsson
2013-04-29Merge branch 'maint'Fredrik Gustafsson
2013-04-29Merge branch 'as/fix-srp-psk-anon/OTP-11071' into maintFredrik Gustafsson
* as/fix-srp-psk-anon/OTP-11071: fix srp_anon ciphers suites requiring certificates to work.
2013-04-29Merge branch 'maint'Fredrik Gustafsson
2013-04-29Update primary bootstrapFredrik Gustafsson
2013-04-29Merge branch 'nox/fix-multiple-ref-regs/OTP-11069' into maintFredrik Gustafsson
* nox/fix-multiple-ref-regs/OTP-11069: Use a set to store ref registers in beam_receive
2013-04-26Fix an inconsistent state in eppAnthony Ramine
When entering a new file, epp doesn't properly set #epp.name2 like it does on initialisation, generating a malformed file attribute when it leaves the file.
2013-04-26Prepare releaseErlang/OTP
2013-04-26Merge branch 'pan/monitor_long_schedule' into maint-r15Erlang/OTP
* pan/monitor_long_schedule: Skip testcase on platforms w/o pipes/usleep Add documentation for new system_monitor Add long_schedule detection for ports and testcases Add erlang:system_monitor(Pid,[{long_schedule,Millis}])
2013-04-26Skip testcase on platforms w/o pipes/usleepPatrik Nyblom
2013-04-25Add documentation for new system_monitorPatrik Nyblom
2013-04-25Add long_schedule detection for ports and testcasesPatrik Nyblom
2013-04-24Merge branch 'maint'Peter Andersson
2013-04-24Merge branch 'peppe/common_test/ts_logfile_problems' into maintPeter Andersson
* peppe/common_test/ts_logfile_problems: Fix error with refreshing logs when html util files are missing Add correct footer to last run index page Make test_server close log files properly and include correct footer
2013-04-24Merge branch 'maint'Lukas Larsson
* maint: Fix src/dest overlap in ttsl driver fix valgrind error in erts/emulator/drivers/unix/ttsl_drv.c
2013-04-24Merge branch 'sv-ttsl-valgrind' into maintLukas Larsson
* sv-ttsl-valgrind: Fix src/dest overlap in ttsl driver fix valgrind error in erts/emulator/drivers/unix/ttsl_drv.c OTP-11064
2013-04-24Merge branch 'maint'Hans Bolinder
* maint: [dialyzer] Fix a bug concerning the --gui and --wx options
2013-04-24Merge branch 'hb/dialyzer/gui-bugfix/OTP-11057' into maintHans Bolinder
* hb/dialyzer/gui-bugfix/OTP-11057: [dialyzer] Fix a bug concerning the --gui and --wx options
2013-04-24[dialyzer] Fix a bug concerning the --gui and --wx optionsHans Bolinder
A bug that made it impossible to do any analyses from the GUI has been fixed. The bug was introduced in dialyzer-2.5.2.
2013-04-22Fix src/dest overlap in ttsl driverLukas Larsson
2013-04-22Fix error with refreshing logs when html util files are missingPeter Andersson
OTP-11046
2013-04-22[jinterface] Extend timetrap timers in nc_SUITE and jinterface_SUITESiri Hansen
2013-04-22[jinterface] Set max heap size for jvm when running echo_serverSiri Hansen
The test cases nc_SUITE:decompress_roundtrip and nc_SUITE:compress_roundtrip fails on some machines with OutOfMemoryException. This commit sets the max heap size for the jvm to 256M in nc_SUITE in order to get around this.
2013-04-22[jinterface] Clean up hanging java nodes after each test caseSiri Hansen
2013-04-22Add correct footer to last run index pagePeter Andersson
OTP-11046
2013-04-22Merge branch 'hb/unicode/OTP-10907'Björn Gustavsson
* hb/unicode/OTP-10907: otp_SUITE: Add test cases to ensure that OTP conventions are obeyed Convert XML files to UTF-8 Convert XML files to UTF-8, where needed Remove the "coding: utf-8" comment from all Erlang source files Update primary bootstrap Change the default encoding of Erlang files to UTF-8
2013-04-22Merge branch 'maint'Lukas Larsson
* maint: crypto: Fix typo in documentation
2013-04-22Merge branch 'kt/fix-crypto-doc-typo' into maintLukas Larsson
* kt/fix-crypto-doc-typo: crypto: Fix typo in documentation OTP-11058
2013-04-21fix valgrind error in erts/emulator/drivers/unix/ttsl_drv.cSteve Vinoski
Running some valgrind memory checking showed the error below: ==18040== Thread 6: ==18040== Source and destination overlap in memcpy(0xf3f3f04, 0xf3f3f08, 52) ==18040== at 0x4C2CFA0: memcpy@@GLIBC_2.14 (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==18040== by 0x5CF527: del_chars (ttsl_drv.c:845) ==18040== by 0x5CED5E: ttysl_from_erlang (ttsl_drv.c:658) ==18040== by 0x4982E3: erts_write_to_port (io.c:1235) ==18040== by 0x49A2BD: erts_port_command (io.c:2223) ==18040== by 0x48C054: do_send (bif.c:1962) ==18040== by 0x48CB6E: erl_send (bif.c:2162) ==18040== by 0x566599: process_main (beam_emu.c:1665) ==18040== by 0x4B1A95: sched_thread_func (erl_process.c:4834) ==18040== by 0x6075E2: thr_wrapper (ethread.c:106) ==18040== by 0x5560E99: start_thread (pthread_create.c:308) This occurred on Linux using R15B01 while the shell was emitting a prompt, but the same problem is still present in R16B. Change the memcpy on line 845 of ttsl_drv.c to memmove as valgrind suggests. After the change, verify with valgrind that the error no longer occurs.
2013-04-21crypto: Fix typo in documentationKlaus Trainer
2013-04-19Add erlang:system_monitor(Pid,[{long_schedule,Millis}])Patrik Nyblom
2013-04-19Merge branch 'maint'Fredrik Gustafsson
2013-04-19Merge branch 'fredrik/ssh/unicode_adapt' into maintFredrik Gustafsson
* fredrik/ssh/unicode_adapt: ssh: unicode adaptions