aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
AgeCommit message (Collapse)Author
2015-09-10Merge branch 'ia/inets/format_status/OTP-12976' into maintIngela Anderton Andin
* ia/inets/format_status/OTP-12976: inets: httpd - Add format_status/2 to httpd_request_handler
2015-09-10Merge branch 'ia/pr/813/OTP-12975' into maintIngela Anderton Andin
* ia/pr/813/OTP-12975: Correct conversion from seconds to milliseconds
2015-09-10Merge branch 'ia/tmanevik_inets/doc' into maintIngela Anderton Andin
* ia/tmanevik_inets/doc: inets: Fix broken links inets: Fix copy paste error inets: ftp - Remove information about alternative solutions inets: httpd - Add links and small corrections inets: httpc - Clarify/correct documentation inets: Align with alphabetical order and clean local anchor handling inets: ftp - add links and fix typos inets: Use ASSCI ' Inets Reference Manual Inets User Guide inets: sorted functions alphabetically inets: Remove documentation of legacy API
2015-09-10inets: Add test suite for socket_wrap featureIngela Anderton Andin
On Linux systems a socket may be opened pre starting Erlang and then passed to Erlangs ftpd or httpd daemon. This is useful as the wrap program can open a privileged port and Erlang does not have to be run as root. The test program will only open a random port, but it exercises the code so that the feature will remain intact.
2015-09-10inets: Ctify inets_SUITEIngela Anderton Andin
Also remove all form of io:formats that can easily be achieved by tracing.
2015-09-10inets: tftpd - Mend broken fd optionIngela Anderton Andin
2015-09-10inets: httpd - Mend broken fd optionIngela Anderton Andin
2015-09-09Correct conversion from seconds to millisecondsJimmy Zöger
2015-09-08inets: Fix broken linksIngela Anderton Andin
2015-09-08inets: Fix copy paste errorIngela Anderton Andin
2015-09-08inets: ftp - Remove information about alternative solutionsIngela Anderton Andin
Currently there is no plans in modernizing/changing the API so there is no real value of pointing out alternative solutions.
2015-09-08inets: httpd - Add links and small correctionsIngela Anderton Andin
2015-09-08inets: httpc - Clarify/correct documentationIngela Anderton Andin
Remove legacy inet6fb4 option from documentation even if the code will still accept it.
2015-09-08inets: Align with alphabetical order and clean local anchor handlingIngela Anderton Andin
Functions in the same module can be referenced as #Function-Arity, no need to make special markers for them.
2015-09-08inets: ftp - add links and fix typosIngela Anderton Andin
2015-09-08inets: Use ASSCI 'Ingela Anderton Andin
2015-09-03inets: httpd - Add format_status/2 to httpd_request_handlerIngela Anderton Andin
Avoid printing sensitive information in supervisor logs
2015-09-01Inets Reference Manualtmanevik
Editorial changes
2015-09-01Inets User Guidetmanevik
Editorial Changes
2015-09-01inets: sorted functions alphabeticallytmanevik
2015-09-01inets: Remove documentation of legacy APItmanevik
2015-07-16inets: cancel for handler with no requestsKirilll Zaborsky
httpc_handler should react properly to cancel requests even when the request to be cancelled was already finished but httpc_manager did not get notified about that yet
2015-06-23Prepare releaseErlang/OTP
2015-06-18Change license text to APLv2Bruce Yinhe
2015-06-16inets: Fix race condition in httpcIngela Anderton Andin
If the socket is closed by the peer do not try to close it again. Solves OTP-11845
2015-06-16inets: Remove use of httpd_conf:clean/1 and httpd_conf:custom_clean/3Ingela Anderton Andin
Internal use of the function white_space_clean/1 could probably be done in a much better way using re-module and removing a lot of legacy code. But we will have to do this later, due to lack of time, we want to make this commit as little work as possible.
2015-06-15inets: Remove use of httpd_conf:make_integer/1Ingela Anderton Andin
2015-06-15inets: Deprecate functions in util module httpd_conf.erlIngela Anderton Andin
These functions should not be used, there exists better functions in the standard libraries.
2015-06-10Merge branch 'scrapinghub/proxy_addr_for_keeped_alive_request'Zandra Hird
* scrapinghub/proxy_addr_for_keeped_alive_request: inets: set proxy address for requests from keep-alive queue OTP-12822
2015-06-09Merge branch 'scrapinghub/asn1_for_http_proxy_suite'Zandra Hird
* scrapinghub/asn1_for_http_proxy_suite: inets: add asn1 to httpc proxy suite
2015-06-09inets: set proxy address for requests from keep-alive queueKirilll Zaborsky
httpc_handler should set correct address of the connected host and not ignore proxy option of the profile while sending requests taken out of keep-alive queue
2015-06-08Merge branch 'ia/inets/name-spaces/OTP-12674'Ingela Anderton Andin
* ia/inets/name-spaces/OTP-12674: inets: Modernize code inets: Add profile option
2015-06-05inets: add asn1 to httpc proxy suiteKirilll Zaborsky
httpc_proxy_SUITE should have asn1 properly started to be invokable standaone
2015-06-05Merge branch 'scrapinghub/proper_stop_on_handling_keepalive_queue'Zandra Hird
* scrapinghub/proper_stop_on_handling_keepalive_queue: inets: proper stop for httpc_handler K-A queue failure OTP-12803
2015-06-04inets: correct the calls in start_appsHenrik Nord
2015-06-04inets: Modernize codeIngela Anderton Andin
* Remove debug macros that mimics call trace. * Remove comments that does not add value. * Structure code
2015-06-04inets: Add profile optionIngela Anderton Andin
To enable the HTTP server to run in a virtualized environment, where there can be more that one server that has the same bind_address and port, we add a new option profile. The profile name will be used in concatenation with bind_address and port to identify the HTTP server instance. The name profile was chosen as there is a similar concept in the HTTP client where profile names can be used to instantiate client configurations.
2015-06-03Merge branch 'scrapinghub/async-typo'Henrik Nord
* scrapinghub/async-typo: Typo 'asynchroneous' fix
2015-06-02restore broken fileHenrik Nord
2015-06-02Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
2015-06-01inets: proper stop for httpc_handler K-A queue failureKirilll Zaborsky
httpc_handler should respond with proper {stop, Reason, State} message when sending request from keep-alive queue fails
2015-06-01Update release notesErlang/OTP
2015-05-29inets: Prepare for releaseIngela Anderton Andin
2015-05-29inets: Add customize optionIngela Anderton Andin
Many HTTP headers are optional, and it could be desirable for the server to filter and maybe even alter them without replacing the mod_* modules that generate/process them. Add new behaviour httpd_custom_api with default implementation in httpd_custom.erl. Add behaviour module in 18 as then we can specify optional callbacks.
2015-05-28Typo 'asynchroneous' fixKirilll Zaborsky
2015-05-27Merge remote-tracking branch 'erlang/pr/741'Henrik Nord
* erlang/pr/741: Minor misprints
2015-05-27Update application versionsHans Bolinder
2015-05-26Minor misprintsKirill Zaborsky
2015-05-18Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION lib/ssh/doc/src/ssh.xml lib/ssh/vsn.mk
2015-05-18Update release notesErlang/OTP