diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:30:50 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-23 16:30:50 +0200 |
| commit | fa5cc308af8c073832cc7b58dd52fa2f523582cc (patch) | |
| tree | bc1b7caf4b56406bdf63ba72faf261c1e51ce6a2 /lib/inets/src/http_server/httpd_request_handler.erl | |
| parent | 10530282667123151c1c24842f6e4bfbd3b59a76 (diff) | |
| parent | 614816910235c0941b2f36da520610e777b35fc3 (diff) | |
| download | otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.gz otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.tar.bz2 otp-fa5cc308af8c073832cc7b58dd52fa2f523582cc.zip | |
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/inets/src/http_server/httpd_request_handler.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 0f47d785ef..cb20159794 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -106,7 +106,7 @@ init([Manager, ConfigDB, AcceptTimeout]) -> case http_transport:negotiate(SocketType, Socket, TimeOut) of {error, Error} -> ?hdrd("negotiation failed", [{error, Error}]), - exit(Error); %% Can be 'normal'. + exit(shutdown); %% Can be 'normal'. ok -> ?hdrt("negotiation successfull", []), NewTimeout = TimeOut - timer:now_diff(now(),Then) div 1000, |