aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
AgeCommit message (Collapse)Author
2016-06-14Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION lib/inets/vsn.mk lib/ssl/test/ssl_basic_SUITE.erl lib/ssl/vsn.mk
2016-06-09inets: Handle multiple \t in mime types fileIngela Anderton Andin
2016-06-03ftp: fix error code errors incl extend test suitesHans Nilsson
2016-06-02ftp: close lsock without crashHans Nilsson
2016-05-18[inets] Remove usage of erlang:now()Lars Thorsen
2016-05-16inets: httpd_util:split does not return {error, Reason}Ingela Anderton Andin
Fix return value handling that was missed when code was refactored to use re-module.
2016-05-09Revert "inets: Put back inets_regexp module in OTP 18"Ingela Anderton Andin
This reverts commit 7fbcbf4d1f2c81d44a5c6a4889c98f32cd4505ae.
2016-05-04Merge branch 'maint-18'Henrik Nord
Conflicts: OTP_VERSION lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl lib/common_test/vsn.mk
2016-05-03inets: Prepare for releaseIngela Anderton Andin
2016-05-03inets: Put back inets_regexp module in OTP 18Ingela Anderton Andin
Put back unused module inets_regexp and remove it in OTP 19 instead as it is an incompatibility, although it is an undocumented module and should not affect other applications (the world is not perfect).
2016-04-27Merge branch 'maint-18'Henrik Nord
Conflicts: OTP_VERSION lib/ssl/doc/src/ssl.xml lib/ssl/src/ssl_cipher.erl lib/ssl/src/tls_v1.erl lib/ssl/test/ssl_basic_SUITE.erl
2016-04-25inets: Add peer_cert to ESI environmentIngela Anderton Andin
2016-04-21inets: Prepare for releaseIngela Anderton Andin
2016-04-21inets: Add peer_cert to ESI environmentIngela Anderton Andin
2016-04-13Merge branch 'henrik/update-copyrightyear'Henrik Nord
* henrik/update-copyrightyear: update copyright-year
2016-04-05Merge branch 'FabioBatSilva/httpc-delete-body/PR-972/OTP-13383'Lars Thorsen
* FabioBatSilva/httpc-delete-body/PR-972/OTP-13383: inets: Add DELETE Body to client remove whitespaces
2016-04-04Merge tag 'OTP-18.3.1'Henrik Nord
=== OTP-18.3.1 === Changed Applications: - erts-7.3.1 - inets-6.2.1 - mnesia-4.13.4 Unchanged Applications: - asn1-4.0.2 - common_test-1.12 - compiler-6.0.3 - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosNotification-1.2.1 - cosProperty-1.2 - cosTime-1.2.1 - cosTransactions-1.3.1 - crypto-3.6.3 - debugger-4.1.2 - dialyzer-2.9 - diameter-1.11.2 - edoc-0.7.18 - eldap-1.2.1 - erl_docgen-0.4.2 - erl_interface-3.8.2 - et-1.5.1 - eunit-2.2.13 - gs-1.6 - hipe-3.15 - ic-4.4 - jinterface-1.6.1 - kernel-4.2 - megaco-3.18 - observer-2.1.2 - odbc-2.11.1 - orber-3.8.1 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - parsetools-2.1.1 - percept-0.8.11 - public_key-1.1.1 - reltool-0.7 - runtime_tools-1.9.3 - sasl-2.7 - snmp-5.2.2 - ssh-4.2.2 - ssl-7.3 - stdlib-2.8 - syntax_tools-1.7 - test_server-3.10 - tools-2.8.3 - typer-0.9.10 - webtool-0.9.1 - wx-1.6.1 - xmerl-1.3.10 Conflicts: OTP_VERSION erts/emulator/test/save_calls_SUITE.erl erts/vsn.mk
2016-03-17inets: Prepare for releaseIngela Anderton Andin
2016-03-16inets: Mend ipv6_host_with_brackets optionIngela Anderton Andin
This is a quick fix to make this option work. We will revisit this and clean up httpc option handling later. Also adding regression tests.
2016-03-15update copyright-yearHenrik Nord
2016-03-07Merge branch 'maint'Raimo Niskanen
2016-03-07Merge branch 'msantos/tftp-wrap-block-counter/PR-965' into maintRaimo Niskanen
* msantos/tftp-wrap-block-counter/PR-965: tftp: support transfer of files > 65535 blocks
2016-03-02Merge branch 'maint'Ingela Anderton Andin
2016-03-01inets: No error reports for expected terminationIngela Anderton Andin
2016-02-22inets: Add DELETE Body to clientFabioBatSilva
2016-02-22remove whitespacesFabioBatSilva
2016-02-12tftp: support transfer of files > 65535 blocksMichael Santos
The block count is an unsigned 2 byte integer. The common behaviour of tftp clients and servers is to overflow the block count and wrap the counter to 0 in order to support files larger than 32M. Modify the tftp implementation to do the same rollover. Interoperability was tested by transferring a 1.4G file using the HPA tftp client.
2016-02-02Merge branch 'maint'Zandra
2016-02-02Merge branch 'palas/maint' into maintZandra
* palas/maint: inets: Add PATCH method to client and server OTP-13286
2016-01-29Merge branch 'maint'Zandra
Conflicts: OTP_VERSION
2016-01-29Merge branch 'ia/maint/inets/mod_alias/OTP-13248' into maint-18Erlang/OTP
* ia/maint/inets/mod_alias/OTP-13248: inets: Prepare for release inets: Traverse all aliases looking for the longest match inets: Use re instead of inets_regexp # Conflicts: # lib/inets/vsn.mk
2016-01-28inets: Traverse all aliases looking for the longest matchIngela Anderton Andin
Before the first matching alias was returned, but we want the longest one to be returned.
2016-01-28inets: Use re instead of inets_regexpIngela Anderton Andin
2015-12-15Merge branch 'maint'Ingela Anderton Andin
2015-12-15inets: Include behaviour modules in install targetIngela Anderton Andin
2015-12-15inets: Fix dialyzer warningIngela Anderton Andin
2015-12-08inets: Add PATCH method to client and serverPablo Lamela
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'scrapinghub/sni_with_connect' into maintZandra
* scrapinghub/sni_with_connect: inets: SNI to be passed with requests through CONNECT OTP-12985
2015-12-01Merge branch 'maint'Ingela Anderton Andin
2015-11-27inets: Add warning header in "chunk trailer" when mod_esi callback times out ↵Ingela Anderton Andin
or fails Also remove legacy debug macros and add help function httpd_util:error_log/2 to avoid code duplication.
2015-11-27inets: Remove exit that generates an incorrect internal server errorIngela Anderton Andin
2015-11-27inets: SNI to be passed with requests through CONNECTKirilll Zaborsky
httpc should fill SNI extenstion for HTTPS requests sent through CONNECT tunnel to provide proper access to websites using SNI
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'weisslj/fix-inets-crash-on-invalid-chunk-size' into maintZandra
* weisslj/fix-inets-crash-on-invalid-chunk-size: inets: Terminate really gracefully on bad chunk OTP-13117
2015-11-20Merge branch 'maint'Zandra
2015-11-15inets: Terminate really gracefully on bad chunkJohannes Weißl
Without this fix, httpc:request/1 crashes the httpc_handler when an invalid chunked length header is encountered (since 77acb47): =ERROR REPORT==== 14-Nov-2015::17:19:30 === ** Generic server <0.651.0> terminating ** Last message in was {tcp,#Port<0.5714>, <<"HTTP/1.1 200 ok\r\nTransfer-Encoding:chunked\r\n\r\nåäö\r\n">>} ** When Server state == {state, [...] ** Reason for termination == ** {bad_return_value,{error,{chunk_size,"åäö"}}}
2015-11-15inets: Allow whitespace after HTTP chunk againJohannes Weißl
Before 77acb47 http:request/1 could parse server responses with whitespace after the HTTP chunk size (some embedded legacy devices still do this). This patch restores this functionality.
2015-11-13Merge branch 'maint'Zandra
Conflicts: OTP_VERSION
2015-11-13Merge branch 'maint-18' into maintZandra