Author: iratqq
Date: Mon Mar 2 10:57:54 2009
New Revision: 5881
Modified:
trunk/scm/http-client.scm
trunk/scm/openssl.scm
Log:
* scm/openssl.scm:
- Guard module-load.
* scm/http-client.scm (http:get):
- Use provided?.
Modified: trunk/scm/http-client.scm
==============================================================================
--- trunk/scm/http-client.scm (original)
+++ trunk/scm/http-client.scm Mon Mar 2 10:57:54 2009
@@ -32,9 +32,7 @@
(require-extension (srfi 1 2 9))
(require "socket.scm")
(require "input-parse.scm")
-(define openssl-loaded?
- (guard (err (else #f))
- (require "openssl.scm")))
+(require "openssl.scm")
(define (http:open hostname servname)
(call-with-getaddrinfo-hints
@@ -224,7 +222,7 @@
(proxy #f)
(ssl #f)
(request-alist '()))
- (let* ((with-ssl? (and openssl-loaded?
+ (let* ((with-ssl? (and (provided? "openssl")
(http-ssl? ssl)))
(call-with-open-file-port-function
(if with-ssl?
Modified: trunk/scm/openssl.scm
==============================================================================
--- trunk/scm/openssl.scm (original)
+++ trunk/scm/openssl.scm Mon Mar 2 10:57:54 2009
@@ -33,7 +33,8 @@
(require "fileio.scm")
(and (not (provided? "openssl"))
- (module-load "openssl")
+ (guard (err (else #f))
+ (module-load "openssl"))
;; init
(SSL-load-error-strings)
