[Emacs-diffs] emacs/lisp net/socks.el ChangeLog

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       09/11/27 07:35:18

Modified files:
        lisp/net       : socks.el 
        lisp           : ChangeLog 

Log message:
        (socks-send-command): Convert binary request to
        unibyte before sending.  This fixes mishandling of some port
        numbers such as 129.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/socks.el?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16754&r2=1.16755

Patches:
Index: net/socks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/socks.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- net/socks.el        24 Sep 2009 01:37:20 -0000      1.14
+++ net/socks.el        27 Nov 2009 07:35:14 -0000      1.15
@@ -435,7 +435,8 @@
                              (error "Unsupported address type for HTTP: %d" 
atype)))
                            port)))
      ((equal version 4)
-      (setq request (format
+      (setq request (string-make-unibyte
+                    (format
                     "%c%c%c%c%s%s%c"
                     version            ; version
                     command            ; command
@@ -444,9 +445,10 @@
                     addr               ; address
                     (user-full-name)   ; username
                     0                  ; terminate username
-                    )))
+                     ))))
      ((equal version 5)
-      (setq request (format
+      (setq request (string-make-unibyte
+                    (format
                     "%c%c%c%c%s%c%c"
                     version            ; version
                     command            ; command
@@ -455,7 +457,7 @@
                     addr               ; address
                     (lsh port -8)      ; port, high byte
                     (- port (lsh (lsh port -8) 8)) ; port, low byte
-                    )))
+                     ))))
      (t
       (error "Unknown protocol version: %d" version)))
     (process-send-string proc request)

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16754
retrieving revision 1.16755
diff -u -b -r1.16754 -r1.16755
--- ChangeLog   27 Nov 2009 04:24:47 -0000      1.16754
+++ ChangeLog   27 Nov 2009 07:35:15 -0000      1.16755
@@ -1,3 +1,9 @@
+2009-11-27  Daiki Ueno  <address@hidden>
+
+       * net/socks.el (socks-send-command): Convert binary request to
+       unibyte before sending.  This fixes mishandling of some port
+       numbers such as 129.
+
 2009-11-27  Stefan Monnier  <address@hidden>
 
        * help.el (describe-bindings-internal): Remove `interactive'.