aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-09-10Merge branch 'ia/ssl/dtls-refactor/OTP-11292' into maintIngela Anderton Andin
* ia/ssl/dtls-refactor/OTP-11292: ssl: Refactor TLS/DTLS record handling ssl: Dialyzer fixes ssl: Solve rebase issues ssl: DTLS record handling ssl: Add DTLS record primitives ssl: Refactor to provide common handshake functions for TLS/DTLS ssl: Add DTLS handshake primitivs.
2013-09-10ssl: Refactor TLS/DTLS record handlingIngela Anderton Andin
2013-09-10ssl: Dialyzer fixesIngela Anderton Andin
2013-09-10ssl: Solve rebase issuesIngela Anderton Andin
2013-09-10ssl: DTLS record handlingIngela Anderton Andin
Also refactor so that TLS and DTLS can have common functions when possible.
2013-09-10ssl: Add DTLS record primitivesAndreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-10ssl: Refactor to provide common handshake functions for TLS/DTLSIngela Anderton Andin
Common functions will be located in ssl_handshake.erl while specific functions will be located in tls_handshake.erl and dtls_handshake.erl
2013-09-10ssl: Add DTLS handshake primitivs.Andreas Schultz
This code is to 99 % written by Andreas Schultz only some small changes to start integrating with OTPs DTLS solution.
2013-09-10Merge branch 'hb/doc/refman_type_corrections/OTP-11090' into maintHans Bolinder
* hb/doc/refman_type_corrections/OTP-11090: Correct documentation of predefined and built-in types
2013-09-09core_lint: Correct the type error() to conform to the codeBjörn Gustavsson
Commit 60984ade updated the code, but not the type spec. Noticed-by: Kostis Sagonas
2013-09-09Merge branch 'bjorn/xml-encoding-fix/OTP-11310' into maintBjörn Gustavsson
* bjorn/xml-encoding-fix/OTP-11310: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
2013-09-09Merge branch 'lukas/erts/erl_exec_e' into maintBjörn-Egil Dahlberg
* lukas/erts/erl_exec_e: +e should be passed through erlexec
2013-09-09Merge branch 'kenneth/doc_to_dtd/OTP-11193' into maintBjörn-Egil Dahlberg
* kenneth/doc_to_dtd/OTP-11193: Corrections so that the documentation confirms to the DTD Minor correction of xml structure to conform to the DTD
2013-09-09Merge branch 'anders/diameter/spawn_opt/OTP-11299' into maintAnders Svensson
* anders/diameter/spawn_opt/OTP-11299: Fix broken spawn_opt
2013-09-09Merge branch 'anders/diameter/failed_avp/OTP-11293' into maintAnders Svensson
* anders/diameter/failed_avp/OTP-11293: Fix Failed-AVP construction for CEA/DWA/DPA
2013-09-09Merge branch 'bmk/snmp/agent/improve_load_unload_mibs_if/OTP-11216' into maintMicael Karlberg
2013-09-09Merge branch 'bjorn/compiler/return_errors/OTP-11304' into maintBjörn Gustavsson
* bjorn/compiler/return_errors/OTP-11304: compiler: Conform returned errors to the documented format
2013-09-09Merge branch 'ks/hipe_unified_loader-cleanup/OTP-11301' into maintFredrik Gustafsson
* ks/hipe_unified_loader-cleanup/OTP-11301: Updated primary bootstrap Cleanup of the file
2013-09-06Merge branch 'dotsimon/os_mon_cpu_sup_solaris64/OTP-11298' into maintFredrik Gustafsson
* dotsimon/os_mon_cpu_sup_solaris64/OTP-11298: Fix broken cpu_sup:nprocs and others on Solaris 64-bit Fix some compiler warnings Remove object files when cleaning
2013-09-06Merge branch 'lukas/r16b02/docfixes' into maintLukas Larsson
* lukas/r16b02/docfixes: Ignore odbc cores Cross compilation is now a supported feature
2013-09-06Merge branch 'lukas/skip-extra-applications/OTP-11288' into maintLukas Larsson
* lukas/skip-extra-applications/OTP-11288: Fix sh compatability issue
2013-09-06Change encoding of troublesome notes.xml files to utf-8Björn Gustavsson
Most notes.xml files will be updated in every release and cause the kind of the problems described in the previous commit.
2013-09-06Convert some notes.xml files from latin-1 to utf-8Björn Gustavsson
In the master branch, the encoding for most xml files have been changed from latin-1 to utf-8. The problem is, that the corresponding files in the maint branch still are encoded in latin-1, and that a merge from maint to master may bring in characters encoded in latin-1 into a notes.xml file declared to be in utf-8. To fix the problem once and for all (for the files involved), we'll need to re-encode the files files utf-8 in maint, and then merge to master. Noticed-by: Magnus Henoch
2013-09-06Merge branch 'nox/fix-erl_lint-variable-usage/OTP-11268' into maintFredrik Gustafsson
* nox/fix-erl_lint-variable-usage/OTP-11268: Updated primary bootstrap Fix variable usage tracking in some record errors Fix unsafe variable tracking in try expressions Fix variable usage tracking in erl_lint
2013-09-06Correct documentation of predefined and built-in typesHans Bolinder
iodata/0, arity/0, and nonempty_list/0,1 have been added; nonempty_maybe_improper_list/1 and maybe_improper_list/1 removed.
2013-09-05Merge branch 'peppe/common_test/missing_space' into maintPeter Andersson
* peppe/common_test/missing_space: Add missing whitespace in string
2013-09-05Add missing whitespace in stringPeter Andersson
2013-09-05Merge branch 'sverk/mac-select-assert-bug' into maintSverker Eriksson
* sverk/mac-select-assert-bug: erts: Fix faulty assert in "unlimited select" for mac
2013-09-05Merge branch 'sverk/valgrind-single-core' into maintSverker Eriksson
* sverk/valgrind-single-core: erts: Speed up valgrind with asynch threads
2013-09-05compiler: Conform returned errors to the documented formatBjörn Gustavsson
ErrorInfo is documented to be: {ErrorLine,Module,ErrorDescriptor} but for some errors with line numbers it would look like: {Module,ErrorDescriptor} Ensure that all ErrorInfo tuples have three elements. Use 'none' instead of a line number: {none,Module,ErrorDescriptor} There already are errors that return 'none' when no line number is available, but that convention was not documented. Mention it in the documentation. Also make sure that the compiler will not print 'none' as a line number in error messages (if the 'report_errors' option is given) as that looks stupid. That is, when attempting to compile a non-existing module, the error message should be: non-existing.erl: no such file or directory and not: non-existing.erl:none: no such file or directory
2013-09-05Updated primary bootstrapFredrik Gustafsson
2013-09-05Merge branch 'raimo/fix-signedness-flaws-in-efile_drv' into maintRaimo Niskanen
* raimo/fix-signedness-flaws-in-efile_drv: Fix EV_* macros and functions signedness flaws
2013-09-05Merge branch 'egil/erl_driver-thread-info/OTP-11303' into maintBjörn-Egil Dahlberg
* egil/erl_driver-thread-info/OTP-11303: erts: Document erl_driver interface lock names erts: Extend erl_driver interface with lock names
2013-09-04erts: Fix faulty assert in "unlimited select" for macSverker Eriksson
2013-09-04Fix Failed-AVP construction for CEA/DWA/DPAAnders Svensson
Send of Failed-AVP resulted in encode failure.
2013-09-04Fix sh compatability issueLukas Larsson
2013-09-04+e should be passed through erlexecLukas Larsson
2013-09-04Fix broken spawn_optAnders Svensson
The option was morphed into a boolean() and then ignored.
2013-09-04Merge branch 'raimo/linux-network-namespace-sockopt/OTP-11157' into maintRaimo Niskanen
* raimo/linux-network-namespace-sockopt/OTP-11157: Document socket option 'netns' Rudimentary test Make netns option value a string Implement netns for SCTP + bugfixes Implement netns option for TCP and UDP Implement emulator netns support for TCP and UDP
2013-09-04Ignore odbc coresLukas Larsson
2013-09-04Merge remote branch 'origin/peppe/common_test/cth_ctrl' into maintPeter Andersson
* origin/peppe/common_test/cth_ctrl: Find and fix minor bugs Add test suite Fix timing related problem Fix problem with start order of hooks and stopping of ct_util_server Introduce pre- and post-test i/o log OTP-11272
2013-09-04Merge branch 'bjorn/asn1/optimize-per-encoding' into maintBjörn Gustavsson
OTP-11300 OTP-11262 * bjorn/asn1/optimize-per-encoding: (25 commits) asn1ct_constucted_per: Directly call asn1ct_gen_per Clean up handling of .asn1db files PER, UPER: Fix encoding/decoding of open types greater than 16K PER, UPER: Optimize table constraints PER, UPER: Optimize encoding using an intermediate format Refactor decoding of components of SEQUENCE OF / SET OF PER,UPER: Get rid of unused 'telltype' argument in decoding functions Optimize the generated encode/2 function UPER: Optimize complete/1 Clean up checking of objects Improve tests of deep table constraints BER: Handle multiple optional SEQUENCE fields with table constraints Test OPTIONAL and DEFAULT for open types PER/UPER: Fix encoding of an object set with multiple inlined constructs Remove broken support for multiple UNIQUE Extend the test for parameterized information objects asn1_SUITE: Remove off-topic (and slow) smp/1 test case SeqOf: Add more tricky SEQUENCE OF tests Clean up handling of extension addition groups Refactor encoding of REAL ...
2013-09-04genop.tab: Add documentation for many BEAM instructionsBjörn Gustavsson
By Erik Stenman (happi) with corrections by me.
2013-09-04Merge branch 'weisslj/httpd_add_script_tests/OTP-11260' into maintFredrik Gustafsson
* weisslj/httpd_add_script_tests/OTP-11260: Test nocache option of mod_cgi and mod_esi
2013-09-04Cleanup of the fileKostis Sagonas
Consisting of three items: - Eliminate uses of is_subtype/2 in specs - Change module-local void functions to return 'ok' instead of [] - Make sure there are no dialyzer warnings with --Wunmatched_returns
2013-09-04Merge branch 'dotsimon/ei_decode_encode_SUITE_true/OTP-11289' into maintFredrik Gustafsson
* dotsimon/ei_decode_encode_SUITE_true/OTP-11289: Fix location of true binary under Mac OSX
2013-09-03erts: Document erl_driver interface lock namesBjörn-Egil Dahlberg
2013-09-03Merge branch 'peppe/common_test/missing_header' into maintPeter Andersson
* peppe/common_test/missing_header: Add missing copyright header
2013-09-03Add missing copyright headerPeter Andersson
2013-09-03Find and fix minor bugsPeter Andersson