aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-20Merge branch 'pg/fix-hipe-bs_get_float2' into devHenrik Nord
* pg/fix-hipe-bs_get_float2: Fix bug with binary pattern matching of floats of variable size OTP-9556
2011-09-20Merge branch 'ta/docs-fixes' into devHenrik Nord
* ta/docs-fixes: Fix misspelling of intermediate Fix typos in erts/preloaded/src Fix more misspellings of compatibility Fix misspelling of kept Fix misspelling of compatibility in ssl_basic_SUITE Fix misspelling of compatibility Fix misspelling of accommodate Fix misspelling of exceed Fix misspelling of accidentally Fix misspelling of erroneous in xmerl_xsd Fix misspelling of erroneous Fix misspelling of successful Fix typos in instrument(3) Fix typos in dbg(3) dialyzer: fix a small typo in list_to_bitstring test Fix typos in cover.erl Fix typos (variable name) in erl_nif(3) Fix typos in mod_esi(3) Fix trivial typos in erlang(3) OTP-9555
2011-09-20Merge branch 'cr/md2-With-RSA-Encryption' into devHenrik Nord
* cr/md2-With-RSA-Encryption: Document crypto:sha_mac_96/2 to compute an SHA MAC, not MD5 Support md2WithRSAEncryption certificates in public_key Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4 OTP-9554
2011-09-20Merge branch 'dj/xmerl_ucs-latin9-support' into devHenrik Nord
* dj/xmerl_ucs-latin9-support: Add latin9 (iso-8859-15) support in xmerl_ucs OTP-9552
2011-09-20Merge branch 'jw/release_handler_1' into devHenrik Nord
* jw/release_handler_1: General improvements to release_handler_1:get_supervised_procs Conflicts: lib/sasl/src/release_handler_1.erl lib/sasl/test/release_handler_SUITE.erl OTP-9546
2011-09-20Merge branch 'mp/xmerl-ucs2-fix' into devHenrik Nord
* mp/xmerl-ucs2-fix: Fixed xmerl_ucs UCS2 little endian en/decoding OTP-9548
2011-09-19Merge branch 'anders/diameter/unhandled_gen_sctp_events/OTP-9538' into devAnders Svensson
* anders/diameter/unhandled_gen_sctp_events/OTP-9538: Handle #sctp_paddr_change and #sctp_pdapi_event from gen_sctp.
2011-09-19Merge branch 'bjorn/stdlib/fix-tar_SUITE' into devBjörn Gustavsson
* bjorn/stdlib/fix-tar_SUITE: tar_SUITE: Work around limited pathname length on Windows
2011-09-19Merge branch 'bjorn/clean-up-bootstraps' into devBjörn Gustavsson
* bjorn/clean-up-bootstraps: Merge the fourth bootstrap stage into the third bootstrap stage Remove unused lib/orber/include/Makefile Remove lib/orber/include/* from the primary bootstrap otp_build update_primary: Don't commit generated source files primary bootstrap: Remove source files
2011-09-19Merge branch 'rickard/glibc-mutex-destroy-bug/OTP-9373' into devRickard Green
* rickard/glibc-mutex-destroy-bug/OTP-9373: Do not abort emulator when buggy pthread impl return EBUSY
2011-09-19Merge branch 'sverker/crypto-rand_uniform-negative/OTP-9526' into devSverker Eriksson
* sverker/crypto-rand_uniform-negative/OTP-9526: [crypto] Fix rand_uniform for negative values
2011-09-19Merge branch 'dgud/mnesia/fix-compat/OTP-9473' into devDan Gudmundsson
* dgud/mnesia/fix-compat/OTP-9473: [mnesia] Fix schema conversion to previous versions [mnesia] Whitespace fixes [mnesia] Update protocol version [mnesia] Mnesia schema merge tested with 2 nodes, r13b04 -> r14b (dev) [mnesia] Fixed bug in aborted schema transactions [mnesia] Add hrl dependency
2011-09-19Merge branch 'egil/fix-compiler-warning/OTP-9542' into devBjörn-Egil Dahlberg
* egil/fix-compiler-warning/OTP-9542: gs: Update to modern type guards in examples os_mon: Check results from fgets in cpu_sup erts: Remove compiler warning in sys.c
2011-09-16Merge branch 'sverker/gen_tcp-httph-explicit' into devSverker Eriksson
* sverker/gen_tcp-httph-explicit: [inet] Clearify doc about packet types httph and httph_bin
2011-09-16[inet] Clearify doc about packet types httph and httph_binSverker Eriksson
2011-09-16gs: Update to modern type guards in examplesBjörn-Egil Dahlberg
2011-09-16os_mon: Check results from fgets in cpu_supBjörn-Egil Dahlberg
2011-09-16Fix misspelling of intermediateTuncer Ayaz
2011-09-16Fix typos in erts/preloaded/srcTuncer Ayaz
2011-09-16erts: Remove compiler warning in sys.cBjörn-Egil Dahlberg
2011-09-16Merge branch 'maint-r14' into devMicael Karlberg
2011-09-16Merge branch 'maint-r13' into maint-r14Micael Karlberg
2011-09-16Merge branch 'pan/erl-bif-types/OTP-9496' into devBjörn-Egil Dahlberg
* pan/erl-bif-types/OTP-9496: Cleanup ETS bif's in hipe:erl_bif_types.erl (for dialyzer)
2011-09-16Merge branch 'pan/win_erlsrv_stop/OTP-9344' into devBjörn-Egil Dahlberg
* pan/win_erlsrv_stop/OTP-9344: Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call Move erts_sys_env_init() to erts_sys_pre_init() Remove _DEBUG from start_erl.c Spelling correction in erlsrv doc Convert windows start_erl to take rootdir on command line Add command start_disabled to erlsrv Add global lock for erlsrv to avoid races Change start order so that service_event gets initialized before it's used
2011-09-16Merge branch 'pan/win_symbolic_link_fixes/OTP-9279' into devBjörn-Egil Dahlberg
* pan/win_symbolic_link_fixes/OTP-9279: Add error code for cyclic symbolic links and make directory links readable
2011-09-16Merge branch 'pan/erts_printf_term/OTP-9435' into devBjörn-Egil Dahlberg
* pan/erts_printf_term/OTP-9435: Correct return values from write-functions in erl_printf
2011-09-16Merge branch 'ia/ssl/packet-httph/OTP-9461' into devIngela Anderton Andin
* ia/ssl/packet-httph/OTP-9461: Support explicit use of packet option httph and httph_bin
2011-09-16Support explicit use of packet option httph and httph_binIngela Anderton Andin
2011-09-16tar_SUITE: Work around limited pathname length on WindowsBjörn Gustavsson
Ever since the test suites were converted to the common_test convention, the tests for long names started to fail on Windows. The reason is that those test cases depend on the current working directory, and that the current working directory in common_test test cases is usually set to a directory with a longer pathname than in test_server test suites. Since neither Erlang/OTP nor common_test provides a portable way to create a temporary directory with a short name, we will have to abuse priv_dir by going upwards from it. For further information, see the comment in run_in_short_tempdir/2.
2011-09-15[mnesia] Fix schema conversion to previous versionsDan Gudmundsson
2011-09-15[mnesia] Whitespace fixesDan Gudmundsson
2011-09-15[mnesia] Update protocol versionDan Gudmundsson
And remove old protocol version hacks
2011-09-15[mnesia] Mnesia schema merge tested with 2 nodes, r13b04 -> r14b (dev)Ulf Wiger
The do_merge_schema function now converts cstructs from a remote node when it detects that they are different. In order to be compatible the other way around, mnesia_controller:get_cstructs() detects a remote caller, and converts the cstructs before sending them.
2011-09-15[mnesia] Fixed bug in aborted schema transactionsDan Gudmundsson
2011-09-15[mnesia] Add hrl dependencyDan Gudmundsson
2011-09-15Fix more misspellings of compatibilityTuncer Ayaz
2011-09-15Fix misspelling of keptTuncer Ayaz
2011-09-15Merge branch 'bmk/inets/httpd/cross_site_scripting_attacks/OTP-9535' into ↵Erlang/OTP
maint-r13 * bmk/inets/httpd/cross_site_scripting_attacks/OTP-9535: Updated http-server to make sure URLs in error-messages are URL-encoded. Added support in http-client to use URL-encoding. Also added the missing include directory for the inets application.
2011-09-15Updated http-server to make sure URLs in error-messagesMicael Karlberg
are URL-encoded. Added support in http-client to use URL-encoding. Also added the missing include directory for the inets application. OTP-8940 [httpd] Prevent XSS in error pages. Prevent user controlled input from being interpreted as HTML in error pages by encoding the reserved HTML characters. Michael Santos OTP-9124
2011-09-15Fix misspelling of compatibility in ssl_basic_SUITETuncer Ayaz
2011-09-15Fix misspelling of compatibilityTuncer Ayaz
2011-09-15Fix misspelling of accommodateTuncer Ayaz
2011-09-15Fix misspelling of exceedTuncer Ayaz
2011-09-15Fix misspelling of accidentallyTuncer Ayaz
2011-09-15Fix misspelling of erroneous in xmerl_xsdTuncer Ayaz
2011-09-15Fix misspelling of erroneousTuncer Ayaz
2011-09-15Fix misspelling of successfulTuncer Ayaz
2011-09-15Fix typos in instrument(3)Tuncer Ayaz
2011-09-15Fix typos in dbg(3)Tuncer Ayaz
2011-09-15dialyzer: fix a small typo in list_to_bitstring testTuncer Ayaz