diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
| commit | 7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (patch) | |
| tree | b34ce11c1aa8ee57d363983d1f8d382ea3a7b64a /lib/inets/src/http_server/httpd_conf.erl | |
| parent | d9a508b6ca18ce3bf76563c89bf452e74fa65d45 (diff) | |
| parent | f05d42599f3c8fa3632ca04c21a5f91100275feb (diff) | |
| download | otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.gz otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.bz2 otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.zip | |
Merge branch 'ia/inets/url-encoding/OTP-8940' into dev
* ia/inets/url-encoding/OTP-8940:
Changed file error handling to be consistent
URL-encoding - add support in client and more usage in server. Also added missing include directory.
Diffstat (limited to 'lib/inets/src/http_server/httpd_conf.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index 8438c4037e..f4d8a6c09f 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -31,8 +31,8 @@ validate_properties/1]). -define(VMODULE,"CONF"). --include("httpd.hrl"). -include("httpd_internal.hrl"). +-include("httpd.hrl"). -include_lib("inets/src/http_lib/http_internal.hrl"). |