aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-12-06Merge branch 'sverk/ppc-hibernate-fix'Sverker Eriksson
* sverk/ppc-hibernate-fix: erts: Fix hipe bug in hibernate on PowerPC
2011-12-06Improve ssl session cleanup testIngela Anderton Andin
Check last delay timer for both client and server side to avoide timing issues.
2011-12-06erts: Remove truncation of http packet parsing and return error insteadSverker Eriksson
This is a slight modification of previous commit by Steve Vinoski For backward compatibility of old users of decode_packet, I think it's enough to return error instead of keeping the old line truncation behaviour.
2011-12-06Merge branch 'ia/public_key/asn1'Ingela Anderton Andin
* ia/public_key/asn1: Asn1 simplification
2011-12-06[wx] Avoid deadlock in handle_sync_eventDan Gudmundsson
Avoid sending cb messages to the wx_object, since it may deadlock. Instead send it to the wxe_server which reads the state from the wx_object's process_dictionary. Ugly but it's the only way I can avoid the deadlock.
2011-12-05Clarify some code commentsLukas Larsson
Thanks Tuncer Ayaz
2011-12-05Make solaris use sendfilevLukas Larsson
sendfilev is a richer API which allows us to do non blocking TCP on solaris. The normal sendfile API seems to have some issue with non blocking sockets and the return value of sendfile.
2011-12-05Skip thread_mseg_alloc_cache_clean() when no mseg_allocRickard Green
2011-12-05Merge branch 'anders/diameter/transport_restart/OTP-9756'Anders Svensson
* anders/diameter/transport_restart/OTP-9756: Fix transport restart bug
2011-12-05Fix misspelling of chosenTuncer Ayaz
2011-12-05honor packet_size for http packet parsing to fix OTP-9389Steve Vinoski
Allow applications to use a packet_size setting on a socket to control acceptable HTTP header line length. This gives them the ability to accept HTTP headers larger than the default settings allow, but also lets them avoid DOS attacks by accepting header lines only up to whatever length they wish to allow. Without this change, if an HTTP request/response line or header arrives on a socket in http, http_bin, httph, or httph_bin parsing mode, and the request/response line or header is too long to fit into a default inet_drv buffer of 1460 bytes, an unexpected error occurs. These problems were described and discussed on erlang-questions in June 2011 in this thread: http://erlang.org/pipermail/erlang-questions/2011-June/059563.html In the original code, no buffer reallocation occurs to enlarge the buffer, even if packet_size or line_length are set in a way that should allow the HTTP data to be parsed properly. The only available workaround was to collect headers and parse them using erlang:decode_packet, but that approach has drawbacks such as having to collect all HTTP header data before it can be handed to decode_packet for correct parsing, and also requiring each and every Erlang web server developer/maintainer to add the workaround to his or her web server. Change the packet parser to honor the packet_size setting for HTTP parsing. If packet_size is set, and an HTTP request/response or header line exceeds the default 1460 byte TCP buffer limit, return an indication to tcp_remain that it should realloc the buffer to enlarge it to packet_size. Also fix the HTTP parsing code to properly honor line_length by truncating any HTTP request/response or header lines that exceed that setting. For backward compatibility, default behavior is unchanged; if an application wants to be able to accept long HTTP header lines, it must set packet_size to an appropriate value. Buffer reallocation occurs only when needed, so the original default buffer size in the code is still the default. Make the line mode parsing honor packet_size as well, for consistency. Add new regression tests to the emulator decode_packet suite and also to the kernel gen_tcp_misc suite. The documentation for packet_size in inet:setopts/2 is already sufficient. Many thanks to Sverker Eriksson for his guidance on how to best fix this bug and also for reviewing a number of patch attempts prior to this one.
2011-12-05Merge branch 'rickard/generic-thr-queue/OTP-9632'Rickard Green
* rickard/generic-thr-queue/OTP-9632: Fix handle_async_ready_clean()
2011-12-05Fix handle_async_ready_clean()Rickard Green
2011-12-05Fix typos in erl(1)Tuncer Ayaz
2011-12-05Fix misspelling of 'turn off'Tuncer Ayaz
2011-12-05Fix typo in reltool(3)Tuncer Ayaz
2011-12-05Fix typo in gen_sctp(3)Tuncer Ayaz
2011-12-05Fix typo in mod_responsecontrol.erlTuncer Ayaz
2011-12-05Fix typo in erts_alloc(3)Tuncer Ayaz
2011-12-05Fix typos in ssl_cipher.erlTuncer Ayaz
2011-12-05Fix typos in expressions.xmlTuncer Ayaz
2011-12-05file: correct make_link/2 and make_symlink/2 docsTuncer Ayaz
2011-12-05Fix typo in test_server(3)Tuncer Ayaz
2011-12-05Fix typos in io_protocol.xmlTuncer Ayaz
2011-12-05Fix typo in erlang(3)Tuncer Ayaz
2011-12-05Fix typos in tar_SUITETuncer Ayaz
2011-12-05Fix typos in erts/preloaded/srcTuncer Ayaz
2011-12-05Merge branch 'master' of super:otpMicael Karlberg
2011-12-05Add proper release notes for ticket OTP-9779.Micael Karlberg
2011-12-05Merge branch 'sverk/crypto-sha256'Sverker Eriksson
* sverk/crypto-sha256: crypto: Add sha256,384,512 in documentation for rsa_verify crypto: Add sha{256,384,512} to rsa_verify crypto: Add sha256 and sha512 OTP-9778
2011-12-05crypto: Add sha256,384,512 in documentation for rsa_verifySverker Eriksson
2011-12-05Convert sasl test suites to pure common test styleSiri Hansen
2011-12-05Merge branch 'sa/dialyzer-fixes'Henrik Nord
* sa/dialyzer-fixes: Correct callback spec in application module Refine warning about callback specs with extra ranges Cleanup autoimport compiler directives Fix Dialyzer's warnings in typer Fix Dialyzer's warning for its own code Fix bug in Dialyzer's behaviours analysis Fix crash in Dialyzer OTP-9776
2011-12-05Improve base_rfc3588.dia formattingAnders Svensson
2011-12-05Make typo fix backwards compatibleAnders Svensson
Also, add better definitions for Termination-Cause so as to avoid grotesquely long macro names in the generated hrl, and for consistency with other enums. That said, the names are still too long to be very practical.
2011-12-05Fix base_rfc3588.dia typoAnders Svensson
2011-12-05Check compiler dependencies in app suiteAnders Svensson
After having added a less than stellar dependency that broke the build. Parallel make could succeed by chance but not sequential. This ensures the error doesn't get past test.
2011-12-05Merge branch 'ia/ssl/test-cases-maint2'Ingela Anderton Andin
* ia/ssl/test-cases-maint2: Added tcp_delivery_workaround to the test case invalid_signature_server
2011-12-05Merge branch 'lukas/common_test/reverse_hook_order/OTP-9774'Lukas Larsson
* lukas/common_test/reverse_hook_order/OTP-9774: Reverse hook order for *_end_per_* hooks
2011-12-05Merge branch 'lars/orber/ssl-options/OTP-9773'Lars Thorsen
* lars/orber/ssl-options/OTP-9773: [orber] Change the option handling for ssl
2011-12-05Added tcp_delivery_workaround to the test case invalid_signature_serverIngela Anderton Andin
The workaround ought to have been added to this case when it was added to the test case invalid_signature_client
2011-12-05Merge branch 'lars/erl_docgen/arity-calculation-bug/OTP-9772'Lars Thorsen
* lars/erl_docgen/arity-calculation-bug/OTP-9772: [erl_docgen] Fix arity calculation bug
2011-12-05[orber] Change the option handling for sslLars Thorsen
2011-12-05[erl_docgen] Fix arity calculation bugLars Thorsen
2011-12-05Merge branch 'bmk/inets/inets58_integration2'Micael Karlberg
2011-12-05Add proper release notes entry for OTP-9628.Micael Karlberg
2011-12-05Merge branch 'sverk/deprecate-nif-reload'Sverker Eriksson
* sverk/deprecate-nif-reload: erts: Deprecate the NIF reload mechanism OTP-9771
2011-12-05Merge branch 'bjorn/test-cases'Björn Gustavsson
* bjorn/test-cases: lcnt_SUITE: Be kind to slow machines crypto_SUITE: Reinstate what was "lost in translation" fileTransferSUITE: Cope with missing/broken crypto application sensitive_SUITE: Fix spuriously failing recv_trace/1 eprof_SUITE: Cope with fast computers and bad time measurements cover_SUITE: Cope with missing/broken crypto application otp_SUITE: Write log files about undefined functions and so on
2011-12-05Add recommendation about RootDir parameter to reltool:eval_target_spec/3Siri Hansen
2011-12-05erts: Remove duplicate erts_unblock_fpeJovi Zhang
The second function erts_unblock_fpe is not needed in here.