aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-19Merge branch 'dev' into majorRickard Green
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 'dev' into majorSverker Eriksson
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 'dev' into majorDan Gudmundsson
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 'dev' into majorBjörn-Egil Dahlberg
* dev: 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-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 'dev' into majorSverker Eriksson
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-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 'dev' into majorBjörn-Egil Dahlberg
* dev: Cleanup ETS bif's in hipe:erl_bif_types.erl (for dialyzer) Conflicts: erts/emulator/beam/erl_db.c
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 'dev' into majorBjörn-Egil Dahlberg
* dev: 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 Conflicts: erts/emulator/sys/win32/sys.c
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 'dev' into majorBjörn-Egil Dahlberg
* dev: Add error code for cyclic symbolic links and make directory links readable
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 'dev' into majorBjörn-Egil Dahlberg
* dev: Correct return values from write-functions in erl_printf
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 remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Support explicit use of packet option httph and httph_bin
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-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-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-14Merge branch 'dev' into majorBjörn Gustavsson
* dev: sys_pre_expand: Don't duplicate options given in the source code
2011-09-14Merge branch 'bjorn/compiler-options/OTP-9534' into devBjörn Gustavsson
* bjorn/compiler-options/OTP-9534: sys_pre_expand: Don't duplicate options given in the source code
2011-09-14sys_pre_expand: Don't duplicate options given in the source codeBjörn Gustavsson
Any compiler options given with a -compile() attribute in source file would be included both at the beginning and the end of the option list for the compiler. Including the options twice is harmless during compilation, but since the options will also be available in Mod:module_info(compile), including them twice will waste memory. Include the options from the source first in the list so that they override options given on the command line.
2011-09-14Merge branch 'dev' into majorLukas Larsson
* dev: Add a high value to test data to catch type cast truncation errors
2011-09-14Merge branch 'lukas/erts/ets_order_testcases/OTP-9459' into devLukas Larsson
* lukas/erts/ets_order_testcases/OTP-9459: Add a high value to test data to catch type cast truncation errors
2011-09-13Merge branch 'dev' into majorHenrik Nord
Conflicts: lib/asn1/doc/src/asn1ct.xml
2011-09-13Merge branch 'ta/werror' into devHenrik Nord
* ta/werror: snmp: extend warnings_as_errors test systools: add warnings_as_errors option asn1ct: add warnings_as_errors option leex: optimize werror/1 yecc: optimize werror/1 yecc: use more descriptive name: 'werror' leex: use more descriptive name: 'werror' compile: optimize werror/1 compile: log warnings as errors if -Werror is enabled yecc: log warnings as errors if -Werror is enabled leex: log warnings as errors if -Werror is enabled yecc: honour -Werror passed from erlc leex: honour -Werror passed from erlc Do not write beam file if Werr and warnings /= [] parsetools: test if warnings_as_errors writes file OTP-9536
2011-09-13Merge branch 'dev' into majorBjörn-Egil Dahlberg
* dev: Make sure we have a run_queue
2011-09-13Merge branch 'egil/fix-run_queue/OTP-9537' into devBjörn-Egil Dahlberg
* egil/fix-run_queue/OTP-9537: Make sure we have a run_queue
2011-09-13Merge branch 'bjorn/erts/unify-register-allocation' into majorBjörn Gustavsson
* bjorn/erts/unify-register-allocation: BEAM: Unify allocation of X and float registers
2011-09-13Merge branch 'ia/ssl/dist/OTP-7053' into majorIngela Anderton Andin
* ia/ssl/dist/OTP-7053: First fully working version Use ssl instead of being a proxy command Connect from both sides works now
2011-09-13Merge branch 'pan/move-dist-headers/OTP-9510' into majorIngela Anderton Andin
* pan/move-dist-headers/OTP-9510: Update bootstrap (manually) Move distribution headers from kernel/src to kernel/include
2011-09-12Make sure we have a run_queueBjörn-Egil Dahlberg
* In rare cases we could have no run_queue in schedule misc ops
2011-09-12Cleanup ETS bif's in hipe:erl_bif_types.erl (for dialyzer)Patrik Nyblom
2011-09-10Merge branch 'dev' into majorBjörn Gustavsson
* dev: erts: Add a sanity check to autoimport_SUITE erts: Fix failing autoimport test case
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 16:17:10 +0000