aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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 'bmk/inets/httpc/expire_data_cookie_parsing_error/OTP-9433' ↵Micael Karlberg
into bmk/inets/inets571_integration
2011-09-06[httpc] Parsing of a cookie expire date should be more forgiving.Micael Karlberg
That is, if the parsing fails, the date should be ignored. Also added support for (yet another) date format: "Tue Jan 01 08:00:01 2036 GMT" OTP-9433
2011-09-06BEAM: Unify allocation of X and float registersBjörn Gustavsson
In the half-word emulator, smp emulator, and non-smp emulator the X register and float register arrays were allocated in different ways. Always allocate the registers and store the pointers to the allocated register arrays in the scheduler data.
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-06General improvements to release_handler_1:get_supervised_procsjoewilliams
The core issues this patch attempts to solve is two fold, 1) have release_handler_1 act slightly differently in two corner cases and 2) clean up the code in get_supervised_procs/0 to remove nested cases and etc. Regarding #1, get_supervised_procs/0 will now call functions to test to see if the supervisor is suspended before attempting to ask it for a list of children. It now will print an error message regarding the suspended supervisor and produce an error that will cause the VM to restart. Previously it would timeout attempting the call to which_children and the VM would restart without any details regarding the reason. The second corner case is if in a child specification a supervisor is incorrectly stated to be a worker and get_modules is called against it. A timeout will occur causing a VM restart. Similar to the last corner case in this patch an error message is printed and an error is emitted causing a VM restart. When first looking into the issue it was hard to discover why my upgrades where failing. All I received during the upgrade process was a timeout and a VM restart, no other information. This patch should help users track down issues like these. Regarding #2, due to the above confusion in trying to figure out what had happened I dug into the code and started tracing it through and found that the nested case statements and etc made it confusing. So I started to rework and clean up, hopefully making this code path clearer to future readers.
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-05Fix bug with binary pattern matching of floats of variable sizePaul Guyot
Pattern matching of floats with variable size (<<F:S/float>>) did always fail. Judging from similar code for ints, this bug is simply a typo.
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 branch 'bmk/snmp/agent/debugging_improvements/OTP-9446' into ↵Micael Karlberg
bmk/snmp/snmp4211_integration Conflicts: lib/snmp/src/app/snmp.appup.src
2011-09-05Merge branch 'bmk/snmp/compiler/wrong_variable_name/OTP-9447' into ↵Micael Karlberg
bmk/snmp/snmp4211_integration
2011-09-05Added entry in the appup file (for 4.21).Micael Karlberg
2011-09-05Release notes "fixed"...Micael Karlberg
2011-09-05Wrapper (e)script did not handle (new) option --Werror.Micael Karlberg
Also removed the "Error : " prefix for error printouts.
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
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