pop3.el: Content-Length generation (was: bad (i.e. serious) mail problems

[Stainless Steel Rat <ratinox@peorth.gweep.net>]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Here is a patch against pop3 1.3q to bring it to 1.3r.  It should generate
a Content-Length header with the same value as the Lines header Gnus
creates (which is converted to X-Content-Length by Gnus somewhere along the 
line).  This should hopefully prevent unescaped envelopes from being a
problem.

Note: it uses `count-lines-buffer' from simple.el, which might not be part
of FSF Emacs (it is part of XEmacs).  If this is the case, does FSF Emacs
have a more or less equivalently useful function, or am I going to have to
roll my own?


[-- Attachment #2: pop3.el patch: 1.3q to 1.3r --]
[-- Type: application/octet-stream, Size: 1560 bytes --]

*** -	Tue Apr  6 14:29:42 1999
--- pop3.el	Tue Apr  6 14:28:09 1999
***************
*** 4,10 ****
  
  ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
  ;; Keywords: mail, pop3
! ;; Version: 1.3q
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
  ;; Keywords: mail, pop3
! ;; Version: 1.3r
  
  ;; This file is part of GNU Emacs.
  
***************
*** 37,43 ****
  (require 'mail-utils)
  (provide 'pop3)
  
! (defconst pop3-version "1.3q")
  
  (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
    "*POP3 maildrop.")
--- 37,43 ----
  (require 'mail-utils)
  (provide 'pop3)
  
! (defconst pop3-version "1.3r")
  
  (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
    "*POP3 maildrop.")
***************
*** 247,253 ****
  	      (setq From_ (concat (substring From_ 0 (match-beginning 0))
  				  (substring From_ (match-end 0)))))
  	    (goto-char (point-min))
! 	    (insert From_))))))
  
  ;; The Command Set
  
--- 247,261 ----
  	      (setq From_ (concat (substring From_ 0 (match-beginning 0))
  				  (substring From_ (match-end 0)))))
  	    (goto-char (point-min))
! 	    (insert From_)
! 	    (re-search-forward "\n\n")
! 	    (narrow-to-region (point) (point-max))
! 	    (let ((lines (count-lines-buffer (current-buffer))))
! 	      (goto-char (point-min))
! 	      (widen)
! 	      (forward-line -2)
! 	      (insert (format "Content-Length: %s\n" lines)))
! 	    )))))
  
  ;; The Command Set
  

[-- Attachment #3: Type: text/plain, Size: 454 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v0.9.5 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE3ClRYgl+vIlSVSNkRAi8uAKD026LoroiOadOr9c3JZXGMcr+DJwCg1VyM
KU1OttiKVz2DRRN/ARsJBWg=
=bqrW
-----END PGP SIGNATURE-----

-- 
Rat <ratinox@peorth.gweep.net>    \ When not in use, Happy Fun Ball should be
Minion of Nathan - Nathan says Hi! \ returned to its special container and
PGP Key: at a key server near you!  \ kept under refrigeration.