* lisp/url/url-http.el (url-http-user-agent-string): Leak less info.

(url-http, url-http-file-exists-p, url-http-file-readable-p)
(url-http-file-attributes, url-http-options, url-https-default-port)
(url-https-asynchronous-p): Don't autoload.

2 files changed, 9 insertions, 15 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a00d748a4a4..01248a91cf2 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-http.el (url-http-user-agent-string): Leak less info.
+        (url-http, url-http-file-exists-p, url-http-file-readable-p)
+        (url-http-file-attributes, url-http-options, url-https-default-port)
+        (url-https-asynchronous-p): Don't autoload.
+
 2012-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-handlers.el (url-file-handler): Don't assume any url-FOO function
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 18d28e89f78..85b6efcde0d 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -215,17 +215,11 @@ request.")
           (and (listp url-privacy-level)
                (memq 'agent url-privacy-level)))
       ""
-    (format "User-Agent: %sURL/%s%s\r\n"
+    (format "User-Agent: %sURL/%s\r\n"
             (if url-package-name
                 (concat url-package-name "/" url-package-version " ")
               "")
-            url-version
-            (cond
-             ((and url-os-type url-system-type)
-              (concat " (" url-os-type "; " url-system-type ")"))
-             ((or url-os-type url-system-type)
-              (concat " (" (or url-system-type url-os-type) ")"))
-             (t "")))))
+            url-version)))
 
 (defun url-http-create-request (&optional ref-url)
   "Create an HTTP request for `url-http-target-url', referred to by REF-URL."
@@ -1153,7 +1147,6 @@ the end of the document."
     (when (eq process-buffer (current-buffer))
       (goto-char (point-max)))))
 
-;;;###autoload
 (defun url-http (url callback cbargs &optional retry-buffer)
   "Retrieve URL via HTTP asynchronously.
 URL must be a parsed URL.  See `url-generic-parse-url' for details.
@@ -1299,7 +1292,6 @@ previous `url-http' call, which is being re-attempted."
         (url-request-data nil))
     (url-retrieve-synchronously url)))
 
-;;;###autoload
 (defun url-http-file-exists-p (url)
   (let ((status nil)
         (exists nil)
@@ -1313,7 +1305,6 @@ previous `url-http' call, which is being re-attempted."
       (kill-buffer buffer))
     exists))
 
-;;;###autoload
 (defalias 'url-http-file-readable-p 'url-http-file-exists-p)
 
 (defun url-http-head-file-attributes (url &optional id-format)
@@ -1333,13 +1324,11 @@ previous `url-http' call, which is being re-attempted."
 
 (declare-function url-dav-file-attributes "url-dav" (url &optional id-format))
 
-;;;###autoload
 (defun url-http-file-attributes (url &optional id-format)
   (if (url-dav-supported-p url)
       (url-dav-file-attributes url id-format)
     (url-http-head-file-attributes url id-format)))
 
-;;;###autoload
 (defun url-http-options (url)
   "Return a property list describing options available for URL.
 This list is retrieved using the `OPTIONS' HTTP method.
@@ -1417,9 +1406,7 @@ p3p
 ;; with url-http.el on systems with 8-character file names.
 (require 'tls)
 
-;;;###autoload
 (defconst url-https-default-port 443 "Default HTTPS port.")
-;;;###autoload
 (defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
 
 ;; FIXME what is the point of this alias being an autoload?