diff options
| author | olgeni <olgeni@FreeBSD.org> | 2004-03-12 03:52:24 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2004-03-12 03:52:24 +0800 |
| commit | a8cafdd62074ef1967a2c5c995dde8932faba11e (patch) | |
| tree | 818d9fd4996a55aa8a7e7c0538e4b31a68e2a3af | |
| parent | b655f165fef6f10c885fcccd2efa62c9a5e522f8 (diff) | |
| download | freebsd-ports-gnome-a8cafdd62074ef1967a2c5c995dde8932faba11e.tar.gz freebsd-ports-gnome-a8cafdd62074ef1967a2c5c995dde8932faba11e.tar.zst freebsd-ports-gnome-a8cafdd62074ef1967a2c5c995dde8932faba11e.zip | |
Do not close a SSL connection when a finite timeout is specified and
triggered (also fixes ejabberd).
Submitted by: demon
Obtained from: Alexey Shchepin
| -rw-r--r-- | lang/erlang/Makefile | 2 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl | 14 | ||||
| -rw-r--r-- | lang/erlang14/Makefile | 2 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl | 14 |
4 files changed, 30 insertions, 2 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 5b1b3e73b4a6..52e7fcaffee6 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -7,7 +7,7 @@ PORTNAME= erlang PORTVERSION= r9c0 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl new file mode 100644 index 000000000000..e91c911ef98d --- /dev/null +++ b/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 ++++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 +@@ -330,6 +330,8 @@ + case gen_tcp:recv(St#st.proxysock, Length, Timeout) of + {ok, Data} -> + {reply, {ok, Data}, St}; ++ {error, timeout} -> ++ {reply, {error, timeout}, St}; + {error, Reason} -> + {reply, {error, Reason}, St#st{status = closing}} + end diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 5b1b3e73b4a6..52e7fcaffee6 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -7,7 +7,7 @@ PORTNAME= erlang PORTVERSION= r9c0 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ diff --git a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl new file mode 100644 index 000000000000..e91c911ef98d --- /dev/null +++ b/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 ++++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 +@@ -330,6 +330,8 @@ + case gen_tcp:recv(St#st.proxysock, Length, Timeout) of + {ok, Data} -> + {reply, {ok, Data}, St}; ++ {error, timeout} -> ++ {reply, {error, timeout}, St}; + {error, Reason} -> + {reply, {error, Reason}, St#st{status = closing}} + end |