From 4a30198f9068cc989616c8088e4b890bc1de259d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Wed, 4 Sep 2013 19:24:54 +0200
Subject: Make cowlib a proper dependency

Start moving a few functions from Cowboy into cowlib.
---
 src/cowboy_spdy.erl | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'src/cowboy_spdy.erl')

diff --git a/src/cowboy_spdy.erl b/src/cowboy_spdy.erl
index 3d39ff5..dfac29c 100644
--- a/src/cowboy_spdy.erl
+++ b/src/cowboy_spdy.erl
@@ -340,11 +340,11 @@ delete_child(Pid, State=#state{children=Children}) ->
 
 request_init(FakeSocket, Peer, OnRequest, OnResponse,
 		Env, Middlewares, Method, Host, Path, Version, Headers) ->
-	Version2 = parse_version(Version),
-	{Host2, Port} = cowboy_protocol:parse_host(Host, false, <<>>),
-	{Path2, Query} = parse_path(Path, <<>>),
+	{Host2, Port} = cow_http:parse_fullhost(Host),
+	{Path2, Qs} = cow_http:parse_fullpath(Path),
+	Version2 = cow_http:parse_version(Version),
 	Req = cowboy_req:new(FakeSocket, ?MODULE, Peer,
-		Method, Path2, Query, Version2, Headers,
+		Method, Path2, Qs, Version2, Headers,
 		Host2, Port, <<>>, true, false, OnResponse),
 	case OnRequest of
 		undefined ->
@@ -357,23 +357,6 @@ request_init(FakeSocket, Peer, OnRequest, OnResponse,
 			end
 	end.
 
-parse_version(<<"HTTP/1.1">>) ->
-	'HTTP/1.1';
-parse_version(<<"HTTP/1.0">>) ->
-	'HTTP/1.0'.
-
-parse_path(<<>>, Path) ->
-	{Path, <<>>};
-parse_path(<< $?, Rest/binary >>, Path) ->
-	parse_query(Rest, Path, <<>>);
-parse_path(<< C, Rest/binary >>, SoFar) ->
-	parse_path(Rest, << SoFar/binary, C >>).
-
-parse_query(<<>>, Path, Query) ->
-	{Path, Query};
-parse_query(<< C, Rest/binary >>, Path, SoFar) ->
-	parse_query(Rest, Path, << SoFar/binary, C >>).
-
 -spec execute(cowboy_req:req(), cowboy_middleware:env(), [module()])
 	-> ok.
 execute(Req, _, []) ->
-- 
cgit v1.2.3