aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-19Merge branch 'dev' into majorAnders Svensson
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 'dev' into majorBjörn Gustavsson
* dev: tar_SUITE: Work around limited pathname length on Windows 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 Conflicts: Makefile.in bootstrap/bin/start.script bootstrap/bin/start_clean.script bootstrap/lib/compiler/ebin/compiler.app bootstrap/lib/compiler/egen/beam_opcodes.erl bootstrap/lib/compiler/egen/core_parse.erl bootstrap/lib/kernel/ebin/kernel.app bootstrap/lib/kernel/ebin/kernel.appup bootstrap/lib/orber/include/Makefile bootstrap/lib/orber/include/corba.hrl bootstrap/lib/orber/include/orber_pi.hrl bootstrap/lib/stdlib/ebin/stdlib.app bootstrap/lib/stdlib/ebin/stdlib.appup bootstrap/lib/stdlib/egen/erl_parse.erl
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 '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-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-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-14Merge the fourth bootstrap stage into the third bootstrap stageBjörn Gustavsson
The sasl application used to have snmp MIBs, thus requiring the snmp and sasl applications to be built in separate bootstrap stage. Since the MIBs in sasl have been moved to the otp_mibs application, the third and fourth bootstrap stages can be merged.
2011-09-14Remove unused lib/orber/include/MakefileBjörn Gustavsson
2011-09-14Remove lib/orber/include/* from the primary bootstrapBjörn Gustavsson
The include files for orber are included in the primary bootstrap, probably for historical reasons. They are not needed there, because no applications compiled in the secondary bootstrap need them. Therefore, install the lib/orber/include/* in the bootstrap at the end of the second bootstrap stage.
2011-09-14otp_build update_primary: Don't commit generated source filesBjörn Gustavsson
Don't commit generated source files to the primary bootstrap.
2011-09-14primary bootstrap: Remove source filesBjörn Gustavsson
The primary bootstrap contains generated source files that are not needed for building Erlang/OTP. Since these files contains dates, version numbers, or absolute path names, new versions of most of those files will be created in the git repository every time the primary bootstrap is updated, thus growing the git repository grow more than necessary.
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-14Handle #sctp_paddr_change and #sctp_pdapi_event from gen_sctp.Anders Svensson
The events are enabled by default but diameter_sctp neither disabled nor dealt with them. Reception of such an event caused a transport process to crash.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 03:42:32 +0000