From 39de3072bcf9fdeec6d3faeb125924c401242205 Mon Sep 17 00:00:00 2001 From: Christopher Lenz Date: Tue, 15 Apr 2008 12:21:00 +0000 Subject: Merged mochiweb branch back into trunk. git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68 --- src/couch_inets/httpd_socket.erl | 62 ---------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 src/couch_inets/httpd_socket.erl (limited to 'src/couch_inets/httpd_socket.erl') diff --git a/src/couch_inets/httpd_socket.erl b/src/couch_inets/httpd_socket.erl deleted file mode 100644 index 8e6a54f4..00000000 --- a/src/couch_inets/httpd_socket.erl +++ /dev/null @@ -1,62 +0,0 @@ -%% ``The contents of this file are subject to the Erlang Public License, -%% Version 1.1, (the "License"); you may not use this file except in -%% compliance with the License. You should have received a copy of the -%% Erlang Public License along with this software. If not, it can be -%% retrieved via the world wide web at http://www.erlang.org/. -%% -%% Software distributed under the License is distributed on an "AS IS" -%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -%% the License for the specific language governing rights and limitations -%% under the License. -%% -%% The Initial Developer of the Original Code is Ericsson Utvecklings AB. -%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings -%% AB. All Rights Reserved.'' -%% -%% $Id$ -%% --module(httpd_socket). - -%% API (document close ?) --export([deliver/3, peername/2, resolve/0, close/2]). - --include("httpd.hrl"). - --define(VMODULE,"SOCKET"). --include_lib("kernel/include/inet.hrl"). - -deliver(SocketType, Socket, IOListOrBinary) -> - case http_transport:send(SocketType, Socket, IOListOrBinary) of - {error, _Reason} -> - (catch close(SocketType, Socket)), - socket_closed; - _ -> - ok - end. - -peername(SocketType, Socket) -> - http_transport:peername(SocketType, Socket). - -resolve() -> - http_transport:resolve(). - -close(SocketType, Socket) -> - close_sleep(SocketType, 1000), - Res = - case (catch http_transport:close(SocketType, Socket)) of - ok -> ok; - {error,Reason} -> {error,Reason}; - {'EXIT',{noproc,_}} -> {error,closed}; - {'EXIT',Reason} -> {error,Reason}; - Otherwise -> {error,Otherwise} - end, - Res. - -%% Workaround for ssl problem when ssl does not deliver the message -%% sent prior to the close before the close signal. -close_sleep({ssl, _}, Time) -> - sleep(Time); -close_sleep(_, _) -> - ok. - -sleep(T) -> receive after T -> ok end. -- cgit v1.2.3