From: Christophe Rhodes Date: Fri, 4 Nov 2005 13:43:50 +0000 (+0000) Subject: 0.9.6.19: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=7f55cdab81d65acd8e7a4acf0f614b4b25f866fd;p=sbcl.git 0.9.6.19: Fixed asdf-install / proxy behaviour (Zach Beane sbcl-devel 2005-10-25) --- diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp index c63f6ba..3672523 100644 --- a/contrib/asdf-install/installer.lisp +++ b/contrib/asdf-install/installer.lisp @@ -101,6 +101,13 @@ (let ((port-start (position #\: url :start 7))) (if port-start (parse-integer url :start (1+ port-start) :junk-allowed t) 80))) +(defun request-uri (url) + (assert (string-equal url "http://" :end1 7)) + (if *proxy* + url + (let ((path-start (position #\/ url :start 7))) + (subseq url path-start)))) + (defun url-connection (url) (let ((s (make-instance 'inet-socket :type :stream :protocol :tcp)) (host (url-host url)) @@ -115,8 +122,12 @@ (let ((stream (socket-make-stream s :input t :output t :buffering :full :external-format :iso-8859-1))) ;; we are exceedingly unportable about proper line-endings here. ;; Anyone wishing to run this under non-SBCL should take especial care - (format stream "GET ~A HTTP/1.0~c~%Host: ~A~c~%Cookie: CCLAN-SITE=~A~c~%~c~%" - url #\Return host #\Return *cclan-mirror* #\Return #\Return) + (format stream "GET ~A HTTP/1.0~c~%~ + Host: ~A~c~%~ + Cookie: CCLAN-SITE=~A~c~%~c~%" + (request-uri url) #\Return + host #\Return + *cclan-mirror* #\Return #\Return) (force-output stream) (setf result (list diff --git a/version.lisp-expr b/version.lisp-expr index cef9527..5448feb 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.6.18" +"0.9.6.19"