aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-19[ftpc] Add a config option to specify a data connect timeout.Micael Karlberg
That is how long the ftp client will wait for the server to connect to the data socket. If this timeout occurs, an error will be returned to the caller and the ftp client process will be terminated. OTP-9545
2011-09-05Merge branch 'bmk/inets/ossl_removed_from_ssl_app/OTP-9522' into ↵Micael Karlberg
bmk/inets/inets58_integration
2011-09-05Removed the option *ossl* from the documentation.Micael Karlberg
OTP-9522
2011-09-05Removed all ossl test cases (for both httpc and httpd).Micael Karlberg
OTP-9522
2011-09-05Removed the ossl config option (from both client and server).Micael Karlberg
The ossl option is no longer valid since the old ssl (OpenSSL based ssl variant) has been removed from the ssl app. OTP-9522
2011-09-05Merge branch 'bmk/inets/httpc/remove_deprecated_module_http/OTP-9359' into ↵Micael Karlberg
bmk/inets/inets58_integration
2011-09-05Merge remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
2011-09-05Merge branch 'ia/ssl/inet-spec-corrections' into devIngela Anderton Andin
* ia/ssl/inet-spec-corrections: Corrected spec name errors: ip_adress -> ip_address port_num -> port_number
2011-09-05Corrected spec name errors: ip_adress -> ip_address port_num -> port_numberIngela Anderton Andin
2011-09-02Merge branch 'dev' into majorHans Bolinder
* dev: Update documentation and specifications of some of the zlib functions Conflicts: erts/preloaded/ebin/zlib.beam
2011-09-02Merge branch 'hb/kernel/zlib_contracts/OTP-9506' into devHans Bolinder
* hb/kernel/zlib_contracts/OTP-9506: Update documentation and specifications of some of the zlib functions
2011-09-02Update documentation and specifications of some of the zlib functionsHans Bolinder
The functions zlib:deflateSetDictionary/2 and zlib:inflateSetDictionary/2 accept iodata() as Dictionary. The functions zlib:crc32/2,3, zlib:adler32/2,3, zlib:compress/1, zlib:uncompress/1, zlib:zip/1, and zlib:unzip/1 accept iodata() as data.
2011-09-02Merge branch 'dev' into majorBjörn Gustavsson
* dev: Make the check_old_code/1 BIF auto-imported Deprecate the docbuilder application Conflicts: lib/stdlib/src/otp_internal.erl
2011-09-02Merge branch 'bjorn/deprecate-docbuilder/OTP-9509' into devBjörn Gustavsson
* bjorn/deprecate-docbuilder/OTP-9509: Deprecate the docbuilder application
2011-09-02Merge branch 'bjorn/erts/old-code-checking-improvements/OTP-9495' into devBjörn Gustavsson
* bjorn/erts/old-code-checking-improvements/OTP-9495: Make the check_old_code/1 BIF auto-imported
2011-09-02Merge branch 'dev' into majorIngela Anderton Andin
* dev: When using output parameters the internal odbc state was not correctly cleaned causing the next call to param_query to missbehave.
2011-09-02Merge branch 'ia/odbc/stored-procedures-does-not-cleanup/OTP-9444' into devIngela Anderton Andin
* ia/odbc/stored-procedures-does-not-cleanup/OTP-9444: When using output parameters the internal odbc state was not correctly cleaned causing the next call to param_query to missbehave.
2011-09-02When using output parameters the internal odbc state was not correctlyIngela Anderton Andin
cleaned causing the next call to param_query to missbehave. Also corrected some test code
2011-09-02Merge branch 'dev' into majorLukas Larsson
* dev: Move test_server_test_lib.hrl to test release dir
2011-09-02Merge branch 'lukas/test_server/fix_suite_compile_error/OTP-9517' into devLukas Larsson
* lukas/test_server/fix_suite_compile_error/OTP-9517: Move test_server_test_lib.hrl to test release dir
2011-09-02Merge branch 'dev' into majorHans Bolinder
* dev: Fix a couple of minor bugs with hook priority Update to reflect addition of CTH priority addition Update CTH priority default to be 0 Update to reflect new cth callback api Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState. Add priority functionality and tests for ct hooks Update internal hooks state to use a record instead of tuples Improve and correct types and specifications in Kernel and STDLIB
2011-09-02Merge branch 'hb/spec_improvements/OTP-9485' into devHans Bolinder
* hb/spec_improvements/OTP-9485: Improve and correct types and specifications in Kernel and STDLIB
2011-09-01Merge branch 'lukas/common_test/cth_prio/OTP-9445' into devLukas Larsson
* lukas/common_test/cth_prio/OTP-9445: Fix a couple of minor bugs with hook priority Update to reflect addition of CTH priority addition Update CTH priority default to be 0 Update to reflect new cth callback api Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState. Add priority functionality and tests for ct hooks Update internal hooks state to use a record instead of tuples
2011-09-01Merge branch 'dev' into majorHenrik Nord
2011-09-01Merge branch 'rc/stdlib-edoc-fix' into devHenrik Nord
* rc/stdlib-edoc-fix: fix broken edoc annotations OTP-9516
2011-09-01Merge branch 'dev' into majorHenrik Nord
2011-09-01Merge branch 'pl/no_bat_files_none_win32' into devHenrik Nord
* pl/no_bat_files_none_win32: Do not install *.bat files on non-win32 machines OTP-9515
2011-09-01Merge branch 'fm/gen_tcp_udp_doc_packet_type' into devHenrik Nord
* fm/gen_tcp_udp_doc_packet_type: Fix type of Packet arg of gen_tcp:send/2 and gen_udp:send/4 OTP-9514
2011-09-01Merge branch 'ta/wx-obsolete-guard' into devHenrik Nord
* ta/wx-obsolete-guard: wx: fix obsolete guard warning (list/1) OTP-9513
2011-09-01Merge branch 'ta/configure-fdatasync' into devHenrik Nord
* ta/configure-fdatasync: Document fdatasync -lrt requirement (SunOS <= 5.10) Move fdatasync autoconf checks to proper place OTP-9512
2011-09-01Merge branch 'ta/hipe_cleanup' into devHenrik Nord
* ta/hipe_cleanup: Clean up hipe.hrl.src (Signed-off-by: Kostis) OTP-9511
2011-09-01Move test_server_test_lib.hrl to test release dirLukas Larsson
2011-09-01Make the check_old_code/1 BIF auto-importedBjörn Gustavsson
check_old_code/1 was documented to be auto-imported, but in fact was not auto-imported. Since check_process_code/2 and the other code loading BIFs are now auto-imported, for consistency auto-import check_old_code/1 too.
2011-09-01Deprecate the docbuilder applicationBjörn Gustavsson
2011-08-31Merge remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Use inet and gen_* dialyzer specs
2011-08-31Merge branch 'ia/ssl/use-inet-and-gen-specs' into devIngela Anderton Andin
* ia/ssl/use-inet-and-gen-specs: Use inet and gen_* dialyzer specs
2011-08-31Use inet and gen_* dialyzer specsIngela Anderton Andin
2011-08-31Fix a couple of minor bugs with hook priorityLukas Larsson
The bugs caused the sorting priority to be wrong when using installed priority and built in priority. Tests to prove the order of hooks to be correct have also been added.
2011-08-31Update to reflect addition of CTH priority additionLukas Larsson
2011-08-31Update CTH priority default to be 0Lukas Larsson
2011-08-31Update to reflect new cth callback apiLukas Larsson
2011-08-31Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} ↵Lukas Larsson
instead of NewState. NewState can still be returned, but is only kept for backward compatability reasons.
2011-08-31Add priority functionality and tests for ct hooksLukas Larsson
Priority allows the user of ct hooks to specify which order the hooks should execute in. The priority of a hook is specified when installing the hook, and stays the same for both pre and post hooks
2011-08-31Update internal hooks state to use a record instead of tuplesLukas Larsson
2011-08-31Merge branch 'lukas/runtime_tools/add_default_trace_patterns/OTP-9458' into ↵Lukas Larsson
major * lukas/runtime_tools/add_default_trace_patterns/OTP-9458: Expand documenation about built-in aliases for tracing patterns Add two additional built-in trace patterns, c and cx
2011-08-31Improve and correct types and specifications in Kernel and STDLIBHans Bolinder
Running Dialyzer on the test suites revealed a few type errors.
2011-08-30Merge branch 'dev' into majorIngela Anderton Andin
* dev: Corrected input argument to error_logger:error_report/1
2011-08-30Merge branch 'ia/ssl/error_logger-info_report-args' into devIngela Anderton Andin
* ia/ssl/error_logger-info_report-args: Corrected input argument to error_logger:error_report/1
2011-08-30Corrected input argument to error_logger:error_report/1Ingela Anderton Andin
2011-08-30Merge branch 'dev' into majorHenrik Nord