aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server
AgeCommit message (Collapse)Author
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-11inets: httpd - Add possibility to specify socket options for HTTPIngela Anderton Andin
Was already possible for HTTPS. Also remove use of legacy option inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4 so this option makes little sense, will use inet (Ipv4) as default instead of inet6fb4.
2015-11-11inets: Terminate gracfully when an invalid chunked length header is encounteredIngela Anderton Andin
Also use integer_to_list/2 and list_to_integer/2 instead of reimplementing it.
2015-10-05Merge branch 'ia/inets/string-not-atom/OTP-13022' into maint-18Erlang/OTP
* ia/inets/string-not-atom/OTP-13022: inets: Use ?MODULE_STRING instead of ?MODULE as argument should be a string
2015-10-01inets: Use ?MODULE_STRING instead of ?MODULE as argument should be a stringIngela Anderton Andin
2015-09-30inets: Add new customize function response_default_headersIngela Anderton Andin
This enables the user to provide default HTTP header values for headers that should always be sent. Note that these values may override built in defaults.
2015-09-30inets: Add behaviour httpd_custom_apiIngela Anderton Andin
Add this now as 18 allows optional callback specs
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-10inets: httpd - Mend broken fd optionIngela Anderton Andin
2015-09-03inets: httpd - Add format_status/2 to httpd_request_handlerIngela Anderton Andin
Avoid printing sensitive information in supervisor logs
2015-06-18Change license text to APLv2Bruce Yinhe
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-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-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-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-18Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION lib/ssh/doc/src/ssh.xml lib/ssh/vsn.mk
2015-05-12inets: reject negative content-lengthHans Nilsson
2015-05-11Merge branch 'zandra/mime-types-config/OTP-12731'Zandra Hird
* zandra/mime-types-config/OTP-12731: make it possible to use a file to configure mime types
2015-05-05make it possible to use a file to configure mime typesZandra Hird
The documentation specifies that a file can be used to configure mime types, but currently it isn't working. With this change it works as documented.
2015-04-23Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION
2015-04-21inets: Add value 'none' in server_tokens configHans Nilsson
When the Server header has empty info (or 'none' in config), it is not generated. This is for limiting Banner Grabbing attempts.
2015-04-07inets: Remove SSI (Server Side Includes)Ingela Anderton Andin
SSI is an old technique implemented by mod_include, that was badly tested and not recommended to use, as having the server parse HTML pages is a double edged sword! It can be costly for a heavily loaded server to perform parsing of HTML pages while sending them. Furthermore, it can be considered a security risk to have average users executing commands in the name of the Erlang node user.
2015-02-03Merge branch 'maint-17' into maintZandra Hird
2015-01-30inets: Consistent view of configuration parameter keep_alive_timeoutIngela Anderton Andin
2015-01-30inets: httpd - mod_alias now handles https URIsIngela Anderton Andin
2015-01-29inets: httpd - Sanity check of content-length headerIngela Anderton Andin
Gracefully handle invalid content-lenght headers instead of crashing in list_to_integer.
2014-12-02fix eacces spellingMikael Pettersson
2014-06-26inets: Create seperate timeout for TLS/SSL handshakeIngela Anderton Andin
We do not want this timeout to be mixed up with the keep alive timeout. We will probably want to make it configurable later.
2014-05-27Merge branch 'ia/inets/maint-17/string-lengths/OTP-11925' into maint-17Erlang/OTP
* ia/inets/maint-17/string-lengths/OTP-11925: inets: httpd - Behave well on not so long but wrong request lines inets: httpc - update test suite framwork to adopt to change in httpd inets: httpd - Reject incorrect large request lines early
2014-05-27inets: Correct distirbing mode for httpd:reload_config/2Ingela Anderton Andin
config_reload tests are not enough to test httpd "block/unblock" used by config_reload, so renable some test cases in the old_httpd_SUITE after making them work with the new code. Should be cleaned up and moved to httpd_SUITE.
2014-05-23inets: httpd - Behave well on not so long but wrong request linesIngela Anderton Andin
2014-05-23inets: httpd - Reject incorrect large request lines earlyIngela Anderton Andin
2014-03-31inets: Handle all response codes in httpd_util:message/3Ingela Anderton Andin
2014-03-20inets: Continue CTify test suiteIngela Anderton Andin
2014-01-10inets: Mend broken max_clients checkIngela Anderton Andin
Conflicts: lib/inets/src/http_server/httpd_manager.erl
2013-12-19inets: Remove use of default gen_server timeoutIngela Anderton Andin
If you need a timeout between client and server use a server side timeout instead of the default gen_server:call/2 timeout that is quite useless. Also remove legacy code that has no further use.
2013-11-12[inets/httpd] Improved request handler terminate error-log entryMicael Karlberg
If a request handler terminates abnormally (terminate reason not normal), the error-log entry was a bit obtuse ("Internal Server Error"). This has been improved so that the log entry now also include the actual terminate reason.
2013-11-12[inets/httpd] Improved access log entryMicael Karlberg
Sometimes the size of a response could be as a string.
2013-11-12[inets/httpd] Logging cleanupMicael Karlberg
Remove logging when fo keep-alive connection timeout. This is a normal event (feature) not an error.
2013-11-12[inets/httpd] Fixed mod_head handling of "new" responseMicael Karlberg
2013-09-05Fix httpd config option 'script_timeout'Johannes Weißl
This fixes the usage of the httpd configuration option 'script_timeout', which got ignored before. The documentation states that the value is in seconds, which was true when using the Apache like configuration file, but not true when using the proplist style configuration.
2013-09-05Fix httpd config option 'keep_alive_timeout'Johannes Weißl
The documentation states that the value is in seconds, which was true when using the Apache like configuration file, but not true when using the proplist style configuration.
2013-08-23Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-08-23Merge branch 'maint-r15' into maint-r16Fredrik Gustafsson
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_lib/http_transport.erl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/src/ssl.appup.src lib/ssl/src/ssl.erl lib/ssl/src/ssl_internal.hrl lib/ssl/src/tls_connection.erl lib/ssl/vsn.mk
2013-08-22Merge branch 'jw/fix-httpd-erl-script-nocache/OTP-11260' into maintFredrik Gustafsson
* jw/fix-httpd-erl-script-nocache/OTP-11260: inets: added simple testcase for option erl_script_nocache Fix httpd config option 'erl_script_nocache'
2013-08-21[inets, ssl]: make log_alert configurable as option in ssl, SSLLogLevel ↵Fredrik Gustafsson
added as option to inets conf file