aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-09-04Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam
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-04Merge branch 'maint'Peter Andersson
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 'maint'Björn Gustavsson
* maint: (26 commits) genop.tab: Add documentation for many BEAM instructions 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 ...
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 'maint'Fredrik Gustafsson
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-04Merge branch 'maint'Fredrik Gustafsson
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-03Merge branch 'maint'Peter Andersson
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
2013-09-03asn1ct_constucted_per: Directly call asn1ct_gen_perBjörn Gustavsson
2013-09-03Clean up handling of .asn1db filesBjörn Gustavsson
There is (differenct) code for reading .asn1db files both in asn1ct and asn1_db. Consolidate the reading into one routine in asn1db. Another problem is that the encoding rule that the .asn1db file was created for is not in the .asn1db, but only in the generated Erlang module. It is much easier and safer to put the encoding rule in the .asn1db file itself. We will also put the version number of the asn1 application into the file, to ensure that we don't use an old .asn1db file that could potentially be incompatible.
2013-09-03PER, UPER: Fix encoding/decoding of open types greater than 16KBjörn Gustavsson
2013-09-03PER, UPER: Optimize table constraintsBjörn Gustavsson
The generated code for table constraints has several problems: * For each object set, a function for getting an encoding or decoding fun is generated, regardless of whether it is actually used. In many specifications, the object set actually used is the union of several other object sets. That means that the code can become a lot bulkier than it would need to be. * The funs are not necessary. The funs just add to the code bloat and generate more unnecessary garbage at run-time. Also, one of the arguments of the fun is the name of the field in the class which is known at compile-time, and the fun for decoding has unused arguments. How to fix the problems: At each call site where an open type should be encoded/decoded, call a specific generated function specialized for the actual object set and the name of the field in the class. When generating the specialized functions, make sure that we re-use a previously generated function if possible.
2013-09-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-03Merge branch 'ia/inets/stronger-test-keys' into maintIngela Anderton Andin
* ia/inets/stronger-test-keys: inets: Add stronger RSA test-keys
2013-09-03inets: Add stronger RSA test-keysIngela Anderton Andin
The ones provided will fail inets test cases as default ssl will negotiate stronger cipher suites now that will fail the with the weak keys.
2013-09-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-09-03Merge branch 'ia/ssl/client-advertised-hashalgorithms' into maintIngela Anderton Andin
* ia/ssl/client-advertised-hashalgorithms: ssl: Do not advertise support for algorithms not supported by crypto
2013-09-03Merge branch 'maint'Hans Bolinder
* maint: Fix a Unicode filename bug affecting Leex and Yecc
2013-09-03Merge branch 'hb/parsetools/unicode_bugfix/OTP-11286' into maintHans Bolinder
* hb/parsetools/unicode_bugfix/OTP-11286: Fix a Unicode filename bug affecting Leex and Yecc
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: Silence gcc warnings in non-smp build
2013-09-02Merge branch 'sv-sched-percentage-option' into maintLukas Larsson
* sv-sched-percentage-option: Silence gcc warnings in non-smp build
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: erts: Fix segfault when scheduling release_port later_op
2013-09-02Merge branch 'lukas/erts/clean_port_msg_dispatcher/OTP-11290' into maintLukas Larsson
* lukas/erts/clean_port_msg_dispatcher/OTP-11290: erts: Fix segfault when scheduling release_port later_op
2013-09-02Silence gcc warnings in non-smp buildLukas Larsson
2013-09-02ssl: Do not advertise support for algorithms not supported by cryptoIngela Anderton Andin
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: Refactor and change EXTRA_APPLICATIONS to use ls Add configure option --without-$app Conflicts: HOWTO/INSTALL.md lib/Makefile
2013-09-02Merge branch 'lukas/skip-extra-applications/OTP-11288' into maintLukas Larsson
* lukas/skip-extra-applications/OTP-11288: Refactor and change EXTRA_APPLICATIONS to use ls Add configure option --without-$app
2013-09-02Refactor and change EXTRA_APPLICATIONS to use lsLukas Larsson
2013-09-02Add configure option --without-$appLukas Larsson
This is used to skip the specified app when building and releasing
2013-09-02Test nocache option of mod_cgi and mod_esiJohannes Weißl
Tests that the nocache options work and can be used independently from each other. This was broken before c8ef69c. Conflicts: lib/inets/test/httpd_basic_SUITE.erl
2013-09-02Merge branch 'maint'Fredrik Gustafsson
2013-09-02Merge branch 'dotsimon/pubkey_aes_cbc/OTP-11281' into maintFredrik Gustafsson
* dotsimon/pubkey_aes_cbc/OTP-11281: Allow public_key:pem_entry_decode/2) to handle AES-128-CBC ciphered keys
2013-09-02Fix a Unicode filename bug affecting Leex and YeccHans Bolinder
A bug where Unicode filenames combined with Latin-1 encoding could crash Yecc and Leex has been fixed.
2013-09-02Add test suitePeter Andersson
2013-09-02Fix timing related problemPeter Andersson
2013-09-02Fix problem with start order of hooks and stopping of ct_util_serverPeter Andersson
2013-09-02Introduce pre- and post-test i/o logPeter Andersson
2013-09-02Merge branch 'maint'Lukas Larsson
* maint: ei ic: install headers and libs into usr
2013-09-02Merge branch 'lukas/export-ei-ic-headers-libs/OTP-11284' into maintLukas Larsson
* lukas/export-ei-ic-headers-libs/OTP-11284: ei ic: install headers and libs into usr
2013-09-02Merge branch 'maint'Peter Andersson
2013-09-02Merge remote branch 'origin/peppe/common_test/test_server_h_problem' into maintPeter Andersson
* origin/peppe/common_test/test_server_h_problem: Remove the obsolete test_server_h error handler Tag sasl and error reports with suite, group, and function in log Conflicts: lib/common_test/src/cth_log_redirect.erl OTP-11263
2013-09-02Merge branch 'maint'Peter Andersson
2013-09-02Merge remote branch 'origin/peppe/common_test/cth_log_error' into maintPeter Andersson
* origin/peppe/common_test/cth_log_error: Fix error in builtin hook calling non-existing function OTP-11238