aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-16Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-16Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maintIngela Anderton Andin
* ia/public_key/Additional-PKCS-support/OTP-10509: Prepare for release public_key: Add PKCS-10 documentation and PKCS-7 test case public_key: Simplified PKCS-7 and PKCS-10 specs. public_key: Added PKCS-10 public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS. public_key: Add PKCS-7
2012-11-16Prepare for releaseIngela Anderton Andin
2012-11-16public_key: Add PKCS-10 documentation and PKCS-7 test caseIngela Anderton Andin
Note that PKCS-7 is an undocumented feature for now. Also added some minor enhancements to the documentation.
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/r15/erlang-spec-error/process_info' into maintPatrik Nyblom
* pan/r15/erlang-spec-error/process_info: Correct spec for erlang:process_info(Pid,links) OTP-10584
2012-11-16Correct spec for erlang:process_info(Pid,links)Patrik Nyblom
2012-11-16Merge branch 'maint'Patrik Nyblom
2012-11-16Merge branch 'pan/port_driver_tutorial/OTP-10573' into maintPatrik Nyblom
* pan/port_driver_tutorial/OTP-10573: Bring driver tutorial up to date.
2012-11-16Bring driver tutorial up to date.Patrik Nyblom
2012-11-16Merge branch 'maint'Rickard Green
* maint: Add clearer warnings about misuse of NIF and driver functionality Fix erlang:memory(ets) Conflicts: erts/emulator/beam/erl_db.c
2012-11-16Merge branch 'rickard/native-doc/OTP-10557' into maintRickard Green
* rickard/native-doc/OTP-10557: Add clearer warnings about misuse of NIF and driver functionality
2012-11-16Merge branch 'rickard/ets-mem-bug/OTP-10558' into maintRickard Green
* rickard/ets-mem-bug/OTP-10558: Fix erlang:memory(ets)
2012-11-15Add clearer warnings about misuse of NIF and driver functionalityRickard Green
2012-11-15Merge remote branch 'upstream/maint'Ingela Anderton Andin
2012-11-15Merge branch 'ia/ssl/prepare-for-release' into maintIngela Anderton Andin
* ia/ssl/prepare-for-release: ssl: Update vsn.mk and ssl.appup.src for release
2012-11-15public_key: Simplified PKCS-7 and PKCS-10 specs.Ingela Anderton Andin
Used defenitions from PKIX1Explicit88 to avoid most of the overcomplicated InformationalFrameWork (and friends) ASN-1 specs. We want to keep the public_key API as small and simple as possible.
2012-11-15public_key: Added PKCS-10Fredrik Gustafsson
2012-11-15public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS.Kenneth Lundin
The ASN-1 compiler could not handle these IMPORTS properly causing compilation errors.
2012-11-15public_key: Add PKCS-7Ingela Anderton Andin
First attempt to add PKCS-7 does not compile
2012-11-15Merge branch 'maint'Siri Hansen
2012-11-15Merge branch 'siri/common_test/ct_netconfc-close-problems' into maintSiri Hansen
* siri/common_test/ct_netconfc-close-problems: [common_test] Allow server to terminate netconf session before rpc-reply [common_test] Ensure process down after ct_netconf:close_session
2012-11-15Merge branch ↵Siri Hansen
'siri/test_server/faulty-tag-printout-for-connection-log/OTP-10571' into maint * siri/test_server/faulty-tag-printout-for-connection-log/OTP-10571: [test_server] Recognize and ignore info_reports for ct connections
2012-11-14ssl: Update vsn.mk and ssl.appup.src for releaseIngela Anderton Andin
2012-11-14[test_server] Recognize and ignore info_reports for ct connectionsSiri Hansen
test_server_h will now recognize info_reports written by ct connection handlers (according to the description in cth_conn_log) and ignore them as they will be completely handled by by ct_conn_log_h. Earlier test_server_h would print a tag (testcase name) before forwarding the report to error_logger_tty_h. This would cause lots of tags in the log with no info report following (since error_logger_tty_h did not handle them).
2012-11-14Merge branch 'vd/jinterface_epmd_localhost'Henrik Nord
* vd/jinterface_epmd_localhost: OtpEpmd.lokupNames() may hang if network is badly configured OTP-10579
2012-11-14[common_test] Allow server to terminate netconf session before rpc-replySiri Hansen
OTP-10570 ct_netconfc:close_session sometimes returned {error,closed} because the ssh connection was closed (from the server side) before the rpc-reply was received by the client. This is normal and can not be helped. It has been corrected so the return will be 'ok' in this case. Other error situations will still give {error,Reason}.
2012-11-14[common_test] Ensure process down after ct_netconf:close_sessionSiri Hansen
OTP-10510 When starting a named netconf connection directly after stopping one with the same name, it sometimes failed with 'connection_exists'. This has been corrected.
2012-11-14Merge remote branch 'upstream/maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl
2012-11-14Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maintIngela Anderton Andin
* ia/ssl/terminate-handling/OTP-10574: ssl: Make sure that the ssl connection process will not hang in terminate function. ssl: Add default values to emulated socket options in internal record
2012-11-13Merge branch 'sverk/hipe-solaris-m4-bug/OTP-10577' into maintSverker Eriksson
* sverk/hipe-solaris-m4-bug/OTP-10577: erts: Change assembler comment for hipe on x86 and amd64 erts: Fix compile error on solaris in generated hipe_amd64_bifs.S
2012-11-13erts: Change assembler comment for hipe on x86 and amd64Sverker Eriksson
Previously done for ppc in c469d8ce14e9544a297d9af48c9da43137122d9a
2012-11-13erts: Fix compile error on solaris in generated hipe_amd64_bifs.SSverker Eriksson
2012-11-13ssl: Make sure that the ssl connection process will not hang in terminate ↵Ingela Anderton Andin
function. Avoid doing gen_tcp/inet socket operations in terminate if socket is already closed. Call gen_tcp:recv/3 in the "data delivery workaround" to avoid hanging.
2012-11-13ssl: Add default values to emulated socket options in internal recordIngela Anderton Andin
The absence of the active default values could cause a process leak
2012-11-12Merge branch 'sverk/halfword-valgrind-suppressions' into maintSverker Eriksson
* sverk/halfword-valgrind-suppressions: crypto: Add valgrind suppression for AES_cbc_encrypt erts: Expand valgrind suppression for zlib Add extra valgrind suppression file for halfword emulator
2012-11-12Merge branch 'maint'Björn Gustavsson
* maint: Fix compiler crash for binary matching and a complicated guard
2012-11-12Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maintBjörn Gustavsson
* bjorn/compiler/binary-matching/OTP-10567: Fix compiler crash for binary matching and a complicated guard
2012-11-12Fix merge from maintRickard Green
2012-11-12Merge branch 'maint'Rickard Green
* maint: ssl: Adopt test case to not take so long Fix bug in erts_port_task_schedule() Use reduction limit in order to determine when to do wakeup Conflicts: erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c
2012-11-12Merge branch 'rickard/port-sched-bug/OTP-10556' into maintRickard Green
* rickard/port-sched-bug/OTP-10556: Fix bug in erts_port_task_schedule()
2012-11-12Merge branch 'rickard/sched-wakeup/OTP-10476' into maintRickard Green
* rickard/sched-wakeup/OTP-10476: Use reduction limit in order to determine when to do wakeup
2012-11-12ssl: Adopt test case to not take so longIngela Anderton Andin
2012-11-12Merge branch 'maint'Fredrik Gustafsson
* maint: Ssh appup modifications Updated appup for ssh Bumped revision Removed some testing variables ssh_opts is now a proper list After auth rsa and dsa passwords is set to undefined Removing the password after auth
2012-11-12Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maintFredrik Gustafsson
* fredrik/ssh-password-conf/OTP-10511: Ssh appup modifications Updated appup for ssh Bumped revision Removed some testing variables ssh_opts is now a proper list After auth rsa and dsa passwords is set to undefined Removing the password after auth
2012-11-09Ssh appup modificationsFredrik Gustafsson
2012-11-09Merge branch 'maint'Lukas Larsson
* maint: Fix bug where require of same name at same config would return name in use
2012-11-09Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maintLukas Larsson
* lukas/common_test/multi_require_bug/OTP-10572: Fix bug where require of same name at same config would return name in use
2012-11-09Fix bug where require of same name at same config would return name in useLukas Larsson
2012-11-09Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssl: Do not use gen_fsm:sync_send_all_state_event/3 timeout
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:14:17 +0000