aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-08-29Merge branch 'maint'Fredrik Gustafsson
Conflicts: erts/preloaded/ebin/zlib.beam
2013-08-29Merge branch 'essen/export-zlib-zstream/OTP-11278' into maintFredrik Gustafsson
* essen/export-zlib-zstream/OTP-11278: Updated preloaded Export type zlib:zstream/0
2013-08-29Updated preloadedFredrik Gustafsson
2013-08-29Merge branch 'pan/time_correction_doc'Patrik Nyblom
* pan/time_correction_doc: Add time correction doc in users guide OTP-11277
2013-08-28Add time correction doc in users guidePatrik Nyblom
2013-08-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-28Merge branch 'ia/ssl/concurrerr/OTP-11255' into maintIngela Anderton Andin
* ia/ssl/concurrerr/OTP-11255: ssl: Make the ssl manager name for erlang distribution over SSL/TLS relative to the module name of the ssl_manager.
2013-08-28ssl: Make the ssl manager name for erlang distribution over SSL/TLSIngela Anderton Andin
relative to the module name of the ssl_manager. This can be beneficial when making tools that rename modules for internal processing in the tool.
2013-08-28Merge branch 'maint'Fredrik Gustafsson
2013-08-28Merge branch 'tab/tramp_emacs_erl/OTP-11270' into maintFredrik Gustafsson
* tab/tramp_emacs_erl/OTP-11270: tools: In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was:
2013-08-28Merge branch 'maint'Fredrik Gustafsson
2013-08-28Merge branch 'fredrik/ssl/log_alert_doc/OTP-11271' into maintFredrik Gustafsson
* fredrik/ssl/log_alert_doc/OTP-11271: ssl: documentation regarding log_alert
2013-08-28Merge branch 'maint'Hans Bolinder
* maint: Fix a Yecc bug
2013-08-28Merge branch 'hb/parsetools/fix_yecc_bug/OTP-11269' into maintHans Bolinder
* hb/parsetools/fix_yecc_bug/OTP-11269: Fix a Yecc bug
2013-08-28Fix a Yecc bugHans Bolinder
A bug causing Yecc to generate badly formed parsers when encountering very simple recursive rules has been fixed. Thanks to Eric Pailleau for reporting the bug.
2013-08-27ssl: documentation regarding log_alertFredrik Gustafsson
2013-08-27tools:Fredrik Gustafsson
In Emacs it is possible to remotely edit a file, by opening for example /ssh:somehost.com:/path/to/file.erl. In Emacs, the feature that makes this possible, is called TRAMP. When compiling such a file, by typing C-c C-k, an inferior Erlang shell is opened on the remote host, but the compilation expression that was evaluated in the remote Erlang shell was: c("/ssh:somehost.com:/path/to/file", [...]). which resulted in a "no such file or directory" error. This commit changes the compilation expression into: c("/path/to/file", [...]). for files opened remotely via TRAMP. The file name is adjusted similarly when compiling .yrl and .xrl files. In a buffer opened remotely, the Elisp function buffer-file-name returns the full path with TRAMP syntax. In this example it would be "/ssh:somehost.com:/path/to/file.erl". A new function, erlang-local-buffer-file-name, has been introduced, which peels off the TRAMP syntax on remotely opened files, while for locally opened files, it just calls buffer-file-name.
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'nox/match-context-return/OTP-11247' into maintFredrik Gustafsson
* nox/match-context-return/OTP-11247: Added primary bootstrap Forbid returning a match context in beam_validator
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'sze/edlin_understand_keys/OTP-11251' into maintFredrik Gustafsson
* sze/edlin_understand_keys/OTP-11251: Added primary bootstrap erts: fixed documentation regarding tty and arrow keys make edlin understand a few important control keys
2013-08-26Merge branch 'maint'Fredrik Gustafsson
2013-08-26Merge branch 'alexrp/export_edge/OTP-11266' into maintFredrik Gustafsson
* alexrp/export_edge/OTP-11266: Export the edge/0 type from the digraph module
2013-08-23Merge branch 'maint'Fredrik Gustafsson
2013-08-23Merge branch 'epa/add_fd_usage_in_rb/OTP-11252' into maintFredrik Gustafsson
* epa/add_fd_usage_in_rb/OTP-11252: kernel: sasl: fixed rb.xml docs Add Fd usage in rb logging
2013-08-23Merge branch 'maint'Patrik Nyblom
2013-08-23Merge branch 'pan/bad_async_thread_distribution/OTP-11243' into maintPatrik Nyblom
* pan/bad_async_thread_distribution/OTP-11243: Create better distribution of files over async threads Initialize errno properly in win32 efile_may_openfile Add debug functionality to retrieve async key OTP-11243 OTP-11265
2013-08-23Create better distribution of files over async threadsPatrik Nyblom
The actual port id is used to create a key from the pointer value which is the ErlDrvPort. To do this a new driver api function driver_async_port_key is added and the driver API minor version is updated. The documentation is updated and the faulty description of how to spread ports over async threads is updated to use the new API. Testcase also added.
2013-08-23Initialize errno properly in win32 efile_may_openfilePatrik Nyblom
2013-08-23Add debug functionality to retrieve async keyPatrik Nyblom
2013-08-23Merge branch 'maint'Fredrik Gustafsson
2013-08-23Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-08-23Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_transport.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl.erl lib/ssl/src/ssl_internal.hrl lib/ssl/src/tls_connection.erl lib/ssl/vsn.mk
2013-08-23Merge branch 'maint'Lukas Larsson
* maint: erts: Fix print out of acul option in crash dump
2013-08-23Merge branch 'lukas/erts/crash_dump_acul/OTP-11264' into maintLukas Larsson
* lukas/erts/crash_dump_acul/OTP-11264: erts: Fix print out of acul option in crash dump
2013-08-23Merge branch 'lukas/erts/efile_undef_behaviour/OTP-11246' into maintLukas Larsson
* lukas/erts/efile_undef_behaviour/OTP-11246: erts: Fix bug in translating ev macros to functions
2013-08-23erts: Fix print out of acul option in crash dumpLukas Larsson
2013-08-23Merge branch 'maint-r15' into maint-r16Björn Gustavsson
Note that this is a fake merge. The bug fix changes files that are no longer present in maint, and the bug will need to be fixed in a different way. * maint-r15: Prepare release PER, UPER: Fix encoding/decoding of open types greater than 16K
2013-08-22Merge branch 'maint'Fredrik Gustafsson
2013-08-22Merge branch 'jw/fix-httpd-erl-script-nocache/OTP-11260' into maintFredrik Gustafsson
* jw/fix-httpd-erl-script-nocache/OTP-11260: inets: added simple testcase for option erl_script_nocache Fix httpd config option 'erl_script_nocache'
2013-08-22Export type zlib:zstream/0Loïc Hoguin
Terms of this type are returned and sometimes sit in states. Exporting it allows us to properly track the types there.
2013-08-22Merge branch 'maint'Hans Bolinder
* maint: Correct the specifications of io_lib:fread/2,3
2013-08-22Merge branch 'hb/stdlib/correct_fread_spec/OTP-11261' into maintHans Bolinder
* hb/stdlib/correct_fread_spec/OTP-11261: Correct the specifications of io_lib:fread/2,3
2013-08-21Correct the specifications of io_lib:fread/2,3Hans Bolinder
Thanks to Chris King and Kostis Sagonas for pinpointing the bug.
2013-08-21Merge branch 'maint'Lukas Larsson
* maint: erts: Fix bug in translating ev macros to functions Prepare release PER, UPER: Fix encoding/decoding of open types greater than 16K
2013-08-21Merge branch 'lukas/erts/efile_undef_behaviour/OTP-11246' into maintLukas Larsson
* lukas/erts/efile_undef_behaviour/OTP-11246: erts: Fix bug in translating ev macros to functions
2013-08-21Merge branch 'lukas/erts/static_nifs/OTP-11258'Lukas Larsson
* lukas/erts/static_nifs/OTP-11258: erts: Document --enable-static-nif/driver erts: Add support for static linked-in drivers erts: Add option to include nifs statically
2013-08-21erts: Document --enable-static-nif/driverLukas Larsson
2013-08-21erts: Add support for static linked-in driversLukas Larsson
None of the OTP linked-in driver are supported
2013-08-21erts: Add option to include nifs staticallyLukas Larsson
Both crypto and asn1 are supported.