aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-06-28Merge branch 'ia/ssl/use-erlang-send-after-instead-of-timer-send-after' into devIngela Anderton Andin
* ia/ssl/use-erlang-send-after-instead-of-timer-send-after: Use erlang:send_after instead of timer:send_after Conflicts: lib/ssl/test/ssl_session_cache_SUITE.erl
2011-06-28Merge branch 'ia/ssl/inet-getopts-crash/OTP-9382' into devIngela Anderton Andin
* ia/ssl/inet-getopts-crash/OTP-9382: Handle inet:getopts/2 and inet:setopts/2 crashes
2011-06-28Merge branch 'dev' of super:otp into devMicael Karlberg
2011-06-28Merge branch 'maint-r14' into devMicael Karlberg
2011-06-28OTP-8493Ingela Anderton Andin
Merge branch 'ia/odbc/prepare-for-release' into dev * ia/odbc/prepare-for-release: Prepare for release
2011-06-28Prepare for releaseIngela Anderton Andin
2011-06-28Merge branch 'hs/odbc/sql_wlongvarchar_support' into devIngela Anderton Andin
* hs/odbc/sql_wlongvarchar_support: Rewrote test case so that it works Add support for SQL_WLONGVARCHAR
2011-06-27Use erlang:send_after instead of timer:send_afterIngela Anderton Andin
Also save latest delay cleanup timer ref so that we can use erlang:read_timer to write a more reliable test case.
2011-06-27Handle inet:getopts/2 and inet:setopts/2 crashesIngela Anderton Andin
2011-06-27Rewrote test case so that it worksIngela Anderton Andin
2011-06-22Merge branch 'hw/fix-doc-typos' into devHenrik Nord
* hw/fix-doc-typos: Fix typos in the epmd documentation OTP-9387
2011-06-22Merge branch 'bmk/inets/inets57_integration2' into maint-r14Erlang/OTP
* bmk/inets/inets57_integration2: Fixed non-related test case (ticket_6035). Corrected appup-file (missing ','). Fixed ipv6 support detection. (httpc) test case cleanups. Uppdated appup-file. Fixed IPv6 test case selection. That is if a IPv6 test case should be run or not. Stopping httpc client... Added test cases for httpd. Clients started stand-alone not properly handled. Clients started stand-alone not properly handled. Temporary solution for profile_name stuff. What about Pids??? SSL with IPv6 now works "in principle". [httpc] Remove unnecessary usage of iolist_to_binary when processing body (for PUT and POST). Filipe David Manana OTP-9317 Set proper version (5.7). Set proper version (5.7). Updated release notes. Peer/sockname resolv doesn't work with IPv6 addrs in HTTP. OTP-9343 OTP-9342: FTP client doesn't work with IPv6 OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
2011-06-22Fixed non-related ftp test case.Micael Karlberg
[ftp] FTP client doesn't work with IPv6 host. Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2
2011-06-22Fixed non-related test case (ticket_6035).Micael Karlberg
2011-06-22Add support for SQL_WLONGVARCHARHanfei Shen
2011-06-20Merge branch 'hb/specs_and_types/OTP-9356' into devHans Bolinder
* hb/specs_and_types/OTP-9356: Add more specs and types
2011-06-20Add more specs and typesHans Bolinder
An incorrect spec, rpc:yield/1, has been fixed.
2011-06-20Merge branch 'hb/erl_docgen/bugfix/OTP-9360' into devHans Bolinder
* hb/erl_docgen/bugfix/OTP-9360: Bugfixes
2011-06-20BugfixesHans Bolinder
2011-06-20Merge branch 'ia/odbc/on-more-platforms' into devIngela Anderton Andin
* ia/odbc/on-more-platforms: Added code to handle old postgres drivers on solaris and running against postgres for linux 64 bits (MySQL 64 seems to be broken). Enabled odbc tests on mac
2011-06-17Merge branch 'siri/sasl/release_handler-windows/OTP-9306' into devSiri Hansen
* siri/sasl/release_handler-windows/OTP-9306: Remove path to erts bin dir from erlsrv arguments
2011-06-17Corrected appup-file (missing ',').Micael Karlberg
2011-06-17Fixed ipv6 support detection.Micael Karlberg
2011-06-17(httpc) test case cleanups.Micael Karlberg
2011-06-17Added code to handle old postgres drivers on solaris and running againstIngela Anderton Andin
postgres for linux 64 bits (MySQL 64 seems to be broken).
2011-06-17Merge branch 'hb/parsetools/remove_dialyzer_warnings/OTP-8318' into devHans Bolinder
* hb/parsetools/remove_dialyzer_warnings/OTP-8318: Remove Dialyzer warnings
2011-06-16Enabled odbc tests on macIngela Anderton Andin
2011-06-16Merge branch 'ia/odbc/mysql' into devIngela Anderton Andin
* ia/odbc/mysql: Test odbc with MySQL
2011-06-16Merge branch 'ia/odbc/ipv6-solaris-eaddrnotavail' into devIngela Anderton Andin
* ia/odbc/ipv6-solaris-eaddrnotavail: Update to handle ipv6-solaris behaviour
2011-06-16Merge branch 'ia/odbc/type-issues' into devIngela Anderton Andin
* ia/odbc/type-issues: In some places SQLLEN should be used instead of SQLINTEGER to get correct type casting even on 64 bit platforms Changed SQLINTEGER to SQLSMALLINTEGER for sql_type in the function encode_data_type
2011-06-16Merge branch 'ia/ssl/longer-timeout-in-testcase' into devIngela Anderton Andin
* ia/ssl/longer-timeout-in-testcase: Time out in test case needs to be longer to make sure clean up is properly executed
2011-06-16Merge branch 'ia/ssl/test-case-without-named-table' into devIngela Anderton Andin
* ia/ssl/test-case-without-named-table: Changed test case so that we do not have to make ets-table named
2011-06-16Remove Dialyzer warningsHans Bolinder
The code that deals with the POSIX version of regexps has been commented out. Robert will add an option as well as some way to set the option in the source file later.
2011-06-15[httpc|httpd] Added support for IPv6 with ssl.Micael Karlberg
OTP-5566 Merge branch 'bmk/inets/handle_ipv6_with_ssl2/OTP-5566' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/inets_test_lib.erl
2011-06-15Uppdated appup-file.Micael Karlberg
2011-06-15Fixed IPv6 test case selection. That is if a IPv6 test case shouldMicael Karlberg
be run or not.
2011-06-15Stopping httpc client...Micael Karlberg
2011-06-15Added test cases for httpd.Micael Karlberg
2011-06-15Clients started stand-alone not properly handled.Micael Karlberg
OTP-9365
2011-06-15Clients started stand-alone not properly handled.Micael Karlberg
OTP-9365
2011-06-15Temporary solution for profile_name stuff. What about Pids???Micael Karlberg
2011-06-15SSL with IPv6 now works "in principle".Micael Karlberg
2011-06-15[httpc] Remove unnecessary usage of iolist_to_binary whenMicael Karlberg
processing body (for PUT and POST). Filipe David Manana OTP-9317 Merge branch 'bmk/inets/httpc/remove_unnecessary_iolist_to_binary_usage2/OTP-9317' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2011-06-15[httpc] Remove unnecessary usage of iolist_to_binary whenMicael Karlberg
processing body (for PUT and POST). Filipe David Manana OTP-9317
2011-06-15Remove path to erts bin dir from erlsrv argumentsSiri Hansen
The service will automatically use the start_erl.exe from the same directory as erlsrv.exe, and heart will use $PATH, which will always have the erts bin dir first. The reason is to avoid using old executables after upgrading erts via the release_handler.
2011-06-15[ftp] FTP client doesn't work with IPv6 host.Micael Karlberg
Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2011-06-15Peer/sockname resolv doesn't work with IPv6 addrs in HTTP.Micael Karlberg
Attila Rajmund Nohl. OTP-9343 Merge branch 'bmk/inets/resolv_doesnt_work_with_ipv6_addrs_in_http/OTP-9343' into bmk/inets/inets57_integration2
2011-06-15Set proper version (5.7).Micael Karlberg
2011-06-15Set proper version (5.7).Micael Karlberg
2011-06-15Merge branch 'siri/stdlib/ensure-dir-no-read-access/OTP-9368' into devSiri Hansen
* siri/stdlib/ensure-dir-no-read-access/OTP-9368: Allow erl_tar to create directories inside directory with no read access