summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prepare releasemaint-r14b03Erlang/OTP2011-07-112-1/+48
|
* Merge branch 'rickard/sbmbc/OTP-9339' into maint-r14Erlang/OTP2011-07-1115-352/+863
|\ | | | | | | | | * rickard/sbmbc/OTP-9339: Use separate memory carriers for small blocks
| * Use separate memory carriers for small blocksRickard Green2011-07-0815-352/+863
| |
* | Merge branch 'sverker/ets_delete-deadlock-race/OTP-9423' into maint-r14Erlang/OTP2011-07-111-23/+24
|\ \ | | | | | | | | | | | | * sverker/ets_delete-deadlock-race/OTP-9423: Fix bug in ets:delete for write_concurrency that could lead to deadlock
| * | Fix bug in ets:delete for write_concurrency that could lead to deadlockSverker Eriksson2011-07-071-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relocking in ets_delete_1() and remove_named_tab() was done by unlocking the table without clearing the is_thread_safe flag. A racing thread could then read-lock the table and then incorrectly write-unlock the table as db_unlock() looked at is_thread_safe to determine which kind of lock to unlock. Several fixes: 1. Make db_unlock() use argument 'kind' instead of is_thread_safe to determine lock type. 2. Make relock logic use db_lock() and db_unlock() instead of directly accessing lock primitives. 3. Do ownership transfer earlier in ets_delete_1 to avoid racing owner process to also start deleting the same table.
* | | Merge branch 'sverker/trace-ms-invalid-op/OTP-9422' into maint-r14Erlang/OTP2011-07-111-0/+4
|\ \ \ | |/ / |/| | | | | | | | * sverker/trace-ms-invalid-op/OTP-9422: Fix a match-spec trace bug that could cause emulator crash
| * | Fix a match-spec trace bug that could cause emulator crashSverker Eriksson2011-07-071-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A trace matchspec with 'enable_trace' or 'disable_trace' in body could cause an emulator crash if a concurrent process altered the trace setting of the traced function by calling erlang:trace_pattern. The effect was a deallocation of the binary holding the matchspec program while it was running. Fixed by increasing reference count of ms-binary in the cases when 'enable_trace' or 'disable_trace' may cause a system block that may alter the ongoing trace. The paradox here is that db_prog_match() is using erts_smp_block_system() to do 'enable_trace' and 'disable_trace' in a safe (atomic) way. But that also have the (non-atomic) effect that racing thread might block the system and change the trace settings with erlang:trace_pattern.
* | Merge branch 'ia/ssl/session-table-clean-up/OTP-9346' into maint-r14Erlang/OTP2011-07-067-24/+109
|\ \ | | | | | | | | | | | | * ia/ssl/session-table-clean-up/OTP-9346: The clean up of the session table now works as intended.
| * | The clean up of the session table now works as intended.Ingela Anderton Andin2011-07-067-24/+109
|/ / | | | | | | | | | | | | In ssl-4.1.5 temporary clean-up processes would crash resulting in that the session table would not be cleaned up (e.i. using more and more memory) and error reports would be printed, but connections would not be affected.
* | Merge branch 'bmk/inets/inets57_integration2' into maint-r14Erlang/OTP2011-06-2215-540/+1133
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bmk/inets/inets57_integration2: Fixed non-related test case (ticket_6035). Corrected appup-file (missing ','). Fixed ipv6 support detection. (httpc) test case cleanups. Uppdated appup-file. Fixed IPv6 test case selection. That is if a IPv6 test case should be run or not. Stopping httpc client... Added test cases for httpd. Clients started stand-alone not properly handled. Clients started stand-alone not properly handled. Temporary solution for profile_name stuff. What about Pids??? SSL with IPv6 now works "in principle". [httpc] Remove unnecessary usage of iolist_to_binary when processing body (for PUT and POST). Filipe David Manana OTP-9317 Set proper version (5.7). Set proper version (5.7). Updated release notes. Peer/sockname resolv doesn't work with IPv6 addrs in HTTP. OTP-9343 OTP-9342: FTP client doesn't work with IPv6 OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
| * \ Fixed non-related ftp test case.Micael Karlberg2011-06-221-12/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ftp] FTP client doesn't work with IPv6 host. Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2
| | * | Fixed non-related test case (ticket_6035).Micael Karlberg2011-06-221-12/+23
| | | |
| * | | Corrected appup-file (missing ',').Micael Karlberg2011-06-171-2/+2
| | | |
| * | | Fixed ipv6 support detection.Micael Karlberg2011-06-171-1/+1
| | | |
| * | | (httpc) test case cleanups.Micael Karlberg2011-06-172-15/+19
| | | |
| * | | [httpc|httpd] Added support for IPv6 with ssl.Micael Karlberg2011-06-1511-513/+1012
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-5566 Merge branch 'bmk/inets/handle_ipv6_with_ssl2/OTP-5566' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/inets_test_lib.erl
| | * | | Uppdated appup-file.Micael Karlberg2011-06-151-2/+8
| | | | |
| | * | | Fixed IPv6 test case selection. That is if a IPv6 test case shouldMicael Karlberg2011-06-153-73/+149
| | | | | | | | | | | | | | | | | | | | be run or not.
| | * | | Stopping httpc client...Micael Karlberg2011-06-152-45/+79
| | | | |
| | * | | Added test cases for httpd.Micael Karlberg2011-06-155-170/+318
| | | | |
| | * | | Clients started stand-alone not properly handled.Micael Karlberg2011-06-152-91/+97
| | | | | | | | | | | | | | | | | | | | OTP-9365
| | * | | Clients started stand-alone not properly handled.Micael Karlberg2011-06-152-6/+4
| | | | | | | | | | | | | | | | | | | | OTP-9365
| | * | | Temporary solution for profile_name stuff. What about Pids???Micael Karlberg2011-06-151-10/+14
| | | | |
| | * | | SSL with IPv6 now works "in principle".Micael Karlberg2011-06-157-198/+420
| | | | |
| * | | | [httpc] Remove unnecessary usage of iolist_to_binary whenMicael Karlberg2011-06-153-8/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing body (for PUT and POST). Filipe David Manana OTP-9317 Merge branch 'bmk/inets/httpc/remove_unnecessary_iolist_to_binary_usage2/OTP-9317' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
| | * | | | [httpc] Remove unnecessary usage of iolist_to_binary whenMicael Karlberg2011-06-154-9/+57
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | processing body (for PUT and POST). Filipe David Manana OTP-9317
| * | | | [ftp] FTP client doesn't work with IPv6 host.Micael Karlberg2011-06-155-6/+23
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
| | * | | Set proper version (5.7).Micael Karlberg2011-06-152-3/+3
| | | | |
| | * | | Updated release notes.Micael Karlberg2011-05-311-0/+34
| | | | |
| | * | | OTP-9342: FTP client doesn't work with IPv6Micael Karlberg2011-05-275-5/+24
| | | |/ | | |/| | | | | | | | | | | | | | | | | OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
| * | | Peer/sockname resolv doesn't work with IPv6 addrs in HTTP.Micael Karlberg2011-06-154-31/+86
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | Attila Rajmund Nohl. OTP-9343 Merge branch 'bmk/inets/resolv_doesnt_work_with_ipv6_addrs_in_http/OTP-9343' into bmk/inets/inets57_integration2
| * | | Set proper version (5.7).Micael Karlberg2011-06-152-3/+3
| | |/ | |/|
| * | Peer/sockname resolv doesn't work with IPv6 addrs in HTTP.Micael Karlberg2011-05-304-31/+86
| |/ | | | | | | OTP-9343
* | Merge branch 'maint-r13' into maint-r14Micael Karlberg2011-06-100-0/+0
|\ \ | |/ |/|
| * Merge branch 'bmk/snmp/manager/override_community_for_req/OTP-9236' into ↵Erlang/OTP2011-05-236-749/+715
| |\ | | | | | | | | | | | | | | | | | | | | | maint-r13 * bmk/snmp/manager/override_community_for_req/OTP-9236: Added (intial) override community stuff. Udated documentation (and version).
| | * Added (intial) override community stuff.Micael Karlberg2011-05-103-643/+476
| | |
| | * Udated documentation (and version).Micael Karlberg2011-05-063-106/+239
| |/
* | Prepare releaseOTP_R14B03Erlang/OTP2011-05-2448-24/+1458
| |
* | Merge branch 'hb/kernel/opaque_decls/OTP-9337' into devBjörn-Egil Dahlberg2011-05-242-2/+2
|\ \ | | | | | | | | | | | | * hb/kernel/opaque_decls/OTP-9337: Modify two opaque types
| * | Modify two opaque typesHans Bolinder2011-05-242-2/+2
| | | | | | | | | | | | | | | Two opaque types that could cause warnings when running Dialyzer have been modified.
* | | Merge branch 'ia/ssl/ets-table-cleanup' into devBjörn-Egil Dahlberg2011-05-242-3/+3
|\ \ \ | | | | | | | | | | | | | | | | * ia/ssl/ets-table-cleanup: Corrected last argument to timer:apply_after also corrected a dilyzer spec
| * | | Corrected last argument to timer:apply_after also corrected a dilyzer specIngela Anderton Andin2011-05-242-3/+3
| | | |
* | | | Merge branch 'ks/erl_bif_types-fixes' into devBjörn-Egil Dahlberg2011-05-242-49/+50
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * ks/erl_bif_types-fixes: Fix crash when a contract range warning is emitted for a module already in plt Fix erroneous definition of t_binary_compiled_pattern()
| * | | Fix crash when a contract range warning is emitted for a module already in pltStavros Aronis2011-05-231-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings about wrong contract ranges are post-processed to be displayed in the file/line that contains the contract, although they can also be emitted while processing other modules. For this relocation to succeed the module that contains the contract should be currently under analysis. If this is not the case the warning is displayed in the file/line of the call that proves the discrepancy in the contract.
| * | | Fix erroneous definition of t_binary_compiled_pattern()Kostis Sagonas2011-05-231-36/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it: 1. Moved types in their proper place 2. Did minor cleanups and 3. Took out an unused function
* | | | Merge branch 'hb/stdlib/spec_fix/OTP-9333' into devHans Bolinder2011-05-232-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * hb/stdlib/spec_fix/OTP-9333: Fix a spec and a type
| * | | | Fix a spec and a typeHans Bolinder2011-05-232-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | A specification that could cause problems for Dialyzer has been fixed. An opaque type in erl_eval has been turned in to a ordinary type. This is a temporary fix.
* | | | Update copyright yearsBjörn-Egil Dahlberg2011-05-20158-158/+158
| | | |
* | | | Update preloaded modulesBjörn-Egil Dahlberg2011-05-208-0/+0
| | | |
* | | | Update primary bootstrapBjörn-Egil Dahlberg2011-05-2059-110/+134
| | | |
View Lorry Controller Status