[Emacs-diffs] /srv/bzr/emacs/trunk r101619: Small url-cache fix.

[Glenn Morris]

------------------------------------------------------------
revno: 101619
author: Julien Danjou <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 13:59:05 -0700
message:
  Small url-cache fix.
  
  * lisp/url/url-cache.el (url-cache-create-filename): Ensure no-port and
  default-port end up with the same cache file.
  (url-cache-create-filename-human-readable)
  (url-cache-create-filename-using-md5): Argument is always in the form of
  a string now.
modified:
  lisp/url/ChangeLog
  lisp/url/url-cache.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-09-23 19:00:31 +0000
+++ b/lisp/url/ChangeLog        2010-09-25 20:59:05 +0000
@@ -1,3 +1,11 @@
+2010-09-25  Julien Danjou  <address@hidden>
+
+       * url-cache.el (url-cache-create-filename): Ensure no-port and
+       default-port end up with the same cache file.
+       (url-cache-create-filename-human-readable)
+       (url-cache-create-filename-using-md5): Argument is always in the form of
+       a string now.
+
 2010-09-23  Glenn Morris  <address@hidden>
 
        * url-cache.el (url-is-cached): Doc fix.

=== modified file 'lisp/url/url-cache.el'
--- a/lisp/url/url-cache.el     2010-09-23 19:00:31 +0000
+++ b/lisp/url/url-cache.el     2010-09-25 20:59:05 +0000
@@ -95,8 +95,7 @@
 (defun url-cache-create-filename-human-readable (url)
   "Return a filename in the local cache for URL."
   (if url
-      (let* ((url (if (vectorp url) (url-recreate-url url) url))
-            (urlobj (url-generic-parse-url url))
+      (let* ((urlobj (url-generic-parse-url url))
             (protocol (url-type urlobj))
             (hostname (url-host urlobj))
             (host-components
@@ -154,8 +153,7 @@
 Very fast if you have an `md5' primitive function, suitably fast otherwise."
   (require 'md5)
   (if url
-      (let* ((url (if (vectorp url) (url-recreate-url url) url))
-            (checksum (md5 url))
+      (let* ((checksum (md5 url))
             (urlobj (url-generic-parse-url url))
             (protocol (url-type urlobj))
             (hostname (url-host urlobj))
@@ -185,7 +183,13 @@
   :group 'url-cache)
 
 (defun url-cache-create-filename (url)
-  (funcall url-cache-creation-function url))
+  (funcall url-cache-creation-function
+           ;; We need to parse+recreate in order to remove the default port
+           ;; if it has been specified: e.g. http://www.example.com:80 will
+           ;; be transcoded as http://www.example.com
+           (url-recreate-url
+            (if (vectorp url) url
+              (url-generic-parse-url url)))))
 
 ;;;###autoload
 (defun url-cache-extract (fnam)