diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
| commit | 5c7fe21f434f15a1005cb0529a64ca8461c83172 (patch) | |
| tree | 6e79aa7bbe1a72eff14e57ef260d371365de9191 /lib/inets/test/Makefile | |
| parent | 5b1d51fedf10ebc6cccaa4f43396f98c644f3ba9 (diff) | |
| parent | da3797589463002f28fc42ef27872650fe1de938 (diff) | |
| download | otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.gz otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.bz2 otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.zip | |
Merge branch 'ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf'
* ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf:
inets httpd: Handle ipfamily option correctly when listning to port 0
inets: Improve ssl handling
inets httpd: The option modules now defaults to its documented default value.
inets httpc: Corrected separation of pipelining and persisten connections
Diffstat (limited to 'lib/inets/test/Makefile')
| -rw-r--r-- | lib/inets/test/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile index 0ca99e8692..0e7954fba8 100644 --- a/lib/inets/test/Makefile +++ b/lib/inets/test/Makefile @@ -184,7 +184,8 @@ MODULES = \ inets_app_test \ inets_appup_test \ tftp_test_lib \ - tftp_SUITE + tftp_SUITE \ + uri_SUITE EBIN = . |