aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-08-27Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: ssl: Fixed compilation warnings Corrected decoding to encorse a proper error return is there is tag mismatch
2012-08-27Merge branch 'ia/ssl-compilation-warnings' into maintIngela Anderton Andin
* ia/ssl-compilation-warnings: ssl: Fixed compilation warnings
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27ssl: Fixed compilation warningsIngela Anderton Andin
2012-08-27Merge branch 'kenneth/asn1/error_tag_mismatch/OTP-10186' into maintKenneth Lundin
* kenneth/asn1/error_tag_mismatch/OTP-10186: Corrected decoding to encorse a proper error return is there is tag mismatch OTP-10186
2012-08-27Merge branch 'pgö/observer-edit-table-row/OTP-10225' into maintFredrik Gustafsson
* pgö/observer-edit-table-row/OTP-10225: Make Table Viewer search a bit faster Edit table row in a multiline text dialog Conflicts: lib/observer/src/observer_tv_table.erl
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'master' of super:otpFredrik Gustafsson
2012-08-27Merge branch 'sze/ssh-auth_methods/OTP-10224' into maintFredrik Gustafsson
* sze/ssh-auth_methods/OTP-10224: Corrected some documentation according to original SSH: Make "auth_methods" server option re-usable
2012-08-27Merge remote branch 'upstream/maint'Peter Andersson
2012-08-27Merge remote branch 'origin/peppe/common_test/misc_test_failures' into maintPeter Andersson
* origin/peppe/common_test/misc_test_failures: Solve problem with registering parallel testcases
2012-08-27Merge remote branch 'origin/peppe/common_test/bad_func_spec' into maintPeter Andersson
* origin/peppe/common_test/bad_func_spec: Fix error in function specification
2012-08-27Merge remote branch 'origin/peppe/common_test/silent_connection_testspec' ↵Peter Andersson
into maint * origin/peppe/common_test/silent_connection_testspec: Add silent_connections term to test specification
2012-08-27Merge remote branch 'upstream/maint' into maintPeter Andersson
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'pg/fix-zip-multidisk/OTP-10223' into maintFredrik Gustafsson
* pg/fix-zip-multidisk/OTP-10223: Fix bug where zip archives wrongly have a first disk number set to 1
2012-08-27Merge branch 'maint'Fredrik Gustafsson
2012-08-27Merge branch 'pg/fix-zip-multidisk/OTP-10223' into maintFredrik Gustafsson
* pg/fix-zip-multidisk/OTP-10223: Fix bug where zip archives wrongly have a first disk number set to 1
2012-08-27Update preloadedLukas Larsson
2012-08-27Merge branch 'maint'Lukas Larsson
* maint: Bumped version nr ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur. Add more cross reference links to ct docs Remove config option from common_test args Update user config to use nested tuple keys Allow mixed IPv4 and IPv6 addresses to sctp_bindx Add checks for in6addr_any and in6addr_loopback Fix SCTP multihoming observer: fix app file (Noticed-by: Motiejus Jakstys) Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos Prevent index from being corrupted if a nonexistent item is deleted Add tests showing that trying to delete non-existing object may corrupt the table index Fix Table Viewer search crash on new|changed|deleted rows Escape control characters in Table Viewer Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence inet_drv.c: Set sockaddr lengths in inet_set_[f]address Conflicts: erts/preloaded/ebin/prim_inet.beam
2012-08-27Merge branch 'lukas/common_test/deep_get_config/OTP-9626' into maintLukas Larsson
* lukas/common_test/deep_get_config/OTP-9626: Add more cross reference links to ct docs Remove config option from common_test args Update user config to use nested tuple keys
2012-08-27Merge branch 'ia/ssl/countryname-utf8-workaround/OTP-10222' into maintIngela Anderton Andin
* ia/ssl/countryname-utf8-workaround/OTP-10222: ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur.
2012-08-27Merge branch 'bp/fix_mnesia_index_drop/OTP-10220' into maintFredrik Gustafsson
* bp/fix_mnesia_index_drop/OTP-10220: Bumped version nr Prevent index from being corrupted if a nonexistent item is deleted Add tests showing that trying to delete non-existing object may corrupt the table index
2012-08-27Bumped version nrFredrik Gustafsson
2012-08-27Merge branch 'ta/observer-app/OTP-10221' into maintFredrik Gustafsson
* ta/observer-app/OTP-10221: observer: fix app file (Noticed-by: Motiejus Jakstys)
2012-08-27Merge branch 'kr/r15_ssh_test_ipv6_fix/OTP-10219' into maintFredrik Gustafsson
* kr/r15_ssh_test_ipv6_fix/OTP-10219: Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos
2012-08-27Merge branch 'pgö/escape-control-chars-tv/OTP-10218' into maintFredrik Gustafsson
* pgö/escape-control-chars-tv/OTP-10218: Fix Table Viewer search crash on new|changed|deleted rows Escape control characters in Table Viewer Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence
2012-08-27Merge branch 'tab/fix-sctp-multihoming-IPv6/OTP-10217' into maintFredrik Gustafsson
* tab/fix-sctp-multihoming-IPv6/OTP-10217: Allow mixed IPv4 and IPv6 addresses to sctp_bindx Add checks for in6addr_any and in6addr_loopback Fix SCTP multihoming inet_drv.c: Set sockaddr lengths in inet_set_[f]address
2012-08-27Merge branch 'maint'Björn Gustavsson
* maint: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27Merge branch 'bjorn/otp/fix-make_preload/OTP-10201' into maintBjörn Gustavsson
* bjorn/otp/fix-make_preload/OTP-10201: make_preload: Don't fail if Perl's default file encoding is UTF-8
2012-08-27make_preload: Don't fail if Perl's default file encoding is UTF-8Björn Gustavsson
Setting Perl's default encoding for files to UTF-8, for example like this: PERL_UNICODE=DS make would crash the build with a message similar to: form size 1413 greater than size 1237 of module at utils/make_preload line 175, <FILE> chunk 1. Tell Perl to interpret the data in BEAM files as binary by using the binmode() function. The binmode() function existed before Unicode support was added to Perl, which means that make_preload should work even in old versions of Perl. Noticed-by: Aaron Harnly
2012-08-24Merge branch 'maint'Siri Hansen
2012-08-24Merge branch 'siri/common_test/ct_netconfc/OTP-10025' into maintSiri Hansen
* siri/common_test/ct_netconfc/OTP-10025: [common_test] Handle all ssh_cm messages in ct_netconfc:handle_msg/2
2012-08-24Solve problem with registering parallel testcasesPeter Andersson
2012-08-24Merge branch 'peppe/common_test/update_vsn_files' into maintPeter Andersson
* peppe/common_test/update_vsn_files: Update vsn.mk files
2012-08-24Update vsn.mk filesPeter Andersson
2012-08-24Merge branch 'maint'Fredrik Gustafsson
* maint: Fix the erlc -MP flag
2012-08-24Merge branch 'rc/fix-MP-compiler-flag/OTP-10211' into maintFredrik Gustafsson
2012-08-24ssl & public_key: Workaround that some certificates encode countryname as ↵Ingela Anderton Andin
utf8 and close down gracefully if other ASN-1 errors occur. The reason certificate_unknown that is used as ALERT for ASN-1 encoding failure is described as: Some other (unspecified) issue arose in processing the certificate, rendering it unacceptable.
2012-08-24Merge branch 'maint'Lukas Larsson
* maint: Configure now assumed normal doubles Bumped version nr bumped revision make list_suffix/1 and list_prefix/1 handle erl_parse() cons sequences modernized and cleaned up edoc documentation removed obsolete @spec annotations and fixed some -spec and -type annotations preserve line numbers when reverting representation updated author e-mail removed CVS keywords from source files Revise the autoconf tests for double middle endianness. Add test for floating-point output to float_SUITE. Unbreak floating point on middle-endian machines. Add support for NULL value in odbc:param_query Conflicts: xcomp/README.md
2012-08-24Merge branch 'msp/double_middle_endian/OTP-10209' into maintLukas Larsson
* msp/double_middle_endian/OTP-10209: Configure now assumed normal doubles Revise the autoconf tests for double middle endianness. Add test for floating-point output to float_SUITE. Unbreak floating point on middle-endian machines.
2012-08-24Configure now assumed normal doublesLukas Larsson
2012-08-24Merge branch 'rc/syntax_tools-1.6.8/OTP-10208' into maintFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query/OTP-10206' into maintFredrik Gustafsson
2012-08-24Bumped version nrFredrik Gustafsson
2012-08-24Merge branch 'mz/odbc-support-param_query' into maintFredrik Gustafsson
2012-08-24Add silent_connections term to test specificationPeter Andersson
2012-08-23Merge branch 'maint'Sverker Eriksson
2012-08-23Merge branch 'sverk/printf-string-precision-bug' into maintSverker Eriksson
* sverk/printf-string-precision-bug: erts: Fix bug in erts_printf for %s with precision
2012-08-23Fix error in function specificationPeter Andersson