aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-09Merge branch 'bmk/inets/inets58_integration' into majorMicael Karlberg
[httpc] Deprecated interface module <c>http</c> has been removed. It has (long) been replaced by http client interface module httpc. OTP-9359 [httpc|httpd] The old ssl implementation (based on OpenSSL), has been deprecated. The config option that specified usage of this version of the ssl app, *ossl*, has been removed. OTP-9522
2011-09-08Merge branch 'dev' into majorHenrik Nord
2011-09-08Merge branch 'fm/enif_compare-64-to-32bits-cast' into devHenrik Nord
* fm/enif_compare-64-to-32bits-cast: Fix enif_compare on 64bits machines OTP-9533
2011-09-08Merge branch 'dc/fix_win32_static_crypto' into devHenrik Nord
* dc/fix_win32_static_crypto: Fix win32 OpenSSL static linking broken in 20c9d6e OTP-9532
2011-09-08Merge branch 'hw/detect-cpus-on-irix' into devHenrik Nord
* hw/detect-cpus-on-irix: Detect the available CPUs on IRIX OTP-9531
2011-09-08Merge branch 'ms/ei-int-overflow-in-string-atom-enc' into devHenrik Nord
* ms/ei-int-overflow-in-string-atom-enc: ei: integer overflow in string/atom encoding OTP-9530
2011-09-08Merge branch 'sa/dialyzer-dev' into devHenrik Nord
* sa/dialyzer-dev: Add origin information to #fun_var closures Suppress some warnings about generation of non-returning funs Enhance Dialyzer's inference on comparisons Fix infinite loop in dataflow Minor fix in dead code Update r9c/{inets,mnesia} results in dialyzer's test suite OTP-9529
2011-09-08Merge branch 'fm/external_size_2' into devHenrik Nord
* fm/external_size_2: Add erlang:external_size/2 BIF OTP-9528
2011-09-08Merge branch 'ta/erl_compile-dead-code' into devHenrik Nord
* ta/erl_compile-dead-code: Remove dead code in erl_compile OTP-9527
2011-09-08Merge branch 'hw/ignore-empty-epmd-address' into devHenrik Nord
* hw/ignore-empty-epmd-address: Let epmd ignore empty ERL_EPMD_ADDRESS OTP-9525
2011-09-08Merge branch 'dev' into majorBjörn Gustavsson
* dev: erlc_SUITE: Fix arg_overflow/1 test case
2011-09-08Merge branch 'bjorn/erts/fix-erlc_SUITE-arg_overflow' into devBjörn Gustavsson
* bjorn/erts/fix-erlc_SUITE-arg_overflow: erlc_SUITE: Fix arg_overflow/1 test case
2011-09-06Merge branch 'dev' into majorHenrik Nord
2011-09-06Merge branch 'va/httpd-typo-fix' into devHenrik Nord
* va/httpd-typo-fix: Typofix in httpd_file:handle_error message OTP-9524
2011-09-06Merge branch 'pd/ttb-cleanup' into majorHenrik Nord
OTP-9430 OTP-9403 OTP-9431
2011-09-06Merge branch 'dev' into majorIngela Anderton Andin
* dev: Corrected faulty dialyzer spec
2011-09-06Merge branch 'ia/ssl/dialyzer-spec-correction' into devIngela Anderton Andin
* ia/ssl/dialyzer-spec-correction: Corrected faulty dialyzer spec
2011-09-06Corrected faulty dialyzer specIngela Anderton Andin
2011-09-06Merge branch 'dev' into majorSiri Hansen
2011-09-06Merge branch 'siri/sasl/systools-ebin-dir/OTP-9507' into devSiri Hansen
* siri/sasl/systools-ebin-dir/OTP-9507: Fix bug in systools:make_tar when path given as just 'ebin'
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-05Fix bug in systools:make_tar when path given as just 'ebin'Siri Hansen
If a path was given as ONLY 'ebin' and not for example './ebin', then systools:make_tar would fail with a function_clause exception in filename:join/1. The bug was in systools_make:appDir/1, which tried to find the parent directory of the given path. This function now uses library functions filename:basename and filename:dirname instead of general list manipulations.
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 branch 'dev' into majorSiri Hansen
2011-09-05Merge branch 'siri/sasl/check_process_code/OTP-9395' into devSiri Hansen
* siri/sasl/check_process_code/OTP-9395: Add option purge to release_handler:check_install_release Improve performance of upgrade when many processes have old code
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-03erlc_SUITE: Fix arg_overflow/1 test caseBjörn Gustavsson
In commit be8759e68b337524c056b8bb757ea68c9996d863, a buffer overflow was fixed in erlc and the erlc_SUITE:arg_overflow/1 test case was added. That test cases invokes erlc with 10000 -D options, which will result in 'erl' being invoked with more than 30000 arguments. On some platforms, the test case will fail for the wrong reason: * 64-bit Linux kernels before 2.6.23 limit the number of arguments in an excvp() call to 16383. (See "Number of arguments and maximum length of one argument" in http://www.in-ulm.de/~mascheck/various/argmax/.) * The command shell in Windows limits the size of the command line to 8191 characters. Depending on the platform, pass a different number of -D options to erlc. Since the size of the options does not matter for this test case, make the options as short as possible by generating numbers in base 36.
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-02Add option purge to release_handler:check_install_releaseSiri Hansen
Given this option, all modules that are to be purged by indicated upgrade,and that can be soft purged, will be purged when all other check of check_install_release have been successfully completed. I added a note under install_release in the reference manual about how to use check_install_release with this new option in order to speed up the execution of install_release. I also added three more test cases for this functionality.
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-02Fix enif_compare on 64bits machinesFilipe David Manana
In 64bits machines the Sint type has a size of 8 bytes, while on 32bits machines it has a 4 bytes size. enif_compare was ignoring this and therefore returning incorrect values when the result of the CMP function (which returns a Sint value) doesn't fit in 4 bytes. For example, passing the operands -1294536544000 and -1178704800000 to enif_compare would trigger the bug.
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