[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/url/url-gw.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/url/url-gw.el,v |
Date: |
Fri, 27 Oct 2006 14:44:26 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 06/10/27 14:44:25
Index: url-gw.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/url/url-gw.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- url-gw.el 26 Apr 2006 20:40:18 -0000 1.13
+++ url-gw.el 27 Oct 2006 14:44:25 -0000 1.14
@@ -210,7 +210,8 @@
(defun url-open-stream (name buffer host service)
"Open a stream to HOST, possibly via a gateway.
Args per `open-network-stream'.
-Will not make a connection if `url-gateway-unplugged' is non-nil."
+Will not make a connection if `url-gateway-unplugged' is non-nil.
+Might do a non-blocking connection; use `process-status' to check."
(unless url-gateway-unplugged
(let ((gw-method (if (and url-gateway-local-host-regexp
(not (eq 'tls url-gateway-method))
@@ -249,7 +250,11 @@
(ssl
(open-ssl-stream name buffer host service))
((native)
- (open-network-stream name buffer host service))
+ ;; Use non-blocking socket if we can.
+ (make-network-process :name name :buffer buffer
+ :host host :service service
+ :nowait
+ (and nil (featurep
'make-network-process '(:nowait t)))))
(socks
(socks-open-network-stream name buffer host service))
(telnet
- [Emacs-diffs] Changes to emacs/lisp/url/url-gw.el,v,
Chong Yidong <=