.gitignore @@ -1,6 +1,6 @@ {application, ibrowse, [{description, "HTTP client application"}, - {vsn, "1.5.1"}, + {vsn, "1.5.3"}, {modules, [ ibrowse, ibrowse_http_client, ibrowse_app, ebin/ibrowse.app @@ -413,15 +413,31 @@ handle_sock_closed(#state{reply_buffer = Buf, reqs = Reqs, http_status_code = SC State end. -do_connect(Host, Port, _Options, #state{is_ssl=true, ssl_options=SSLOptions}, Timeout) -> +do_connect(Host, Port, Options, #state{is_ssl=true, ssl_options=SSLOptions}, Timeout) -> + Caller_socket_options = get_value(socket_options, Options, []), + Other_sock_options = filter_sock_options(SSLOptions ++ Caller_socket_options), ssl:connect(Host, Port, - [binary, {nodelay, true}, {active, false} | SSLOptions], + [binary, {nodelay, true}, {active, false} | Other_sock_options], Timeout); -do_connect(Host, Port, _Options, _State, Timeout) -> +do_connect(Host, Port, Options, _State, Timeout) -> + Caller_socket_options = get_value(socket_options, Options, []), + Other_sock_options = filter_sock_options(Caller_socket_options), gen_tcp:connect(Host, Port, - [binary, {nodelay, true}, {active, false}], + [binary, {nodelay, true}, {active, false} | Other_sock_options], Timeout). +%% We don't want the caller to specify certain options +filter_sock_options(Opts) -> + lists:filter(fun({active, _}) -> + false; + ({packet, _}) -> + false; + (list) -> + false; + (_) -> + true + end, Opts). + do_send(Req, #state{socket = Sock, is_ssl = true}) -> ssl:send(Sock, Req); do_send(Req, #state{socket = Sock, is_ssl = false}) -> gen_tcp:send(Sock, Req). src/ibrowse_http_client.erl ce2cc0140e7fca5045331e868f04f15d4060eaa7 Chandrashekhar Mullaparthi chandrashekhar.mullaparthi@t-mobile.co.uk http://github.com/dizzyd/ibrowse/commit/2e6bff7e8bc66a774e5beafe84eadb33cb93641f 2e6bff7e8bc66a774e5beafe84eadb33cb93641f 2009-09-06T00:26:47-07:00 2009-09-06T00:26:47-07:00 Allow socket options to be set by caller during the connect phase as well 81f5bf3f7c6ee261b6d1b56de721ea33d28bfc4d Chandrashekhar Mullaparthi chandrashekhar.mullaparthi@t-mobile.co.uk