[Pkg-javascript-commits] [passportjs] 01/01: 2001 patch properly

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository passportjs.

commit bb84711e133ba12ddb106c1ca8ef084d43f2b5fb
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Oct 26 17:00:52 2013 +0200

    2001 patch properly
---
 debian/patches/2001_drop_pause.patch |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/patches/2001_drop_pause.patch b/debian/patches/2001_drop_pause.patch
index 8191f9d..2f8cf4c 100644
--- a/debian/patches/2001_drop_pause.patch
+++ b/debian/patches/2001_drop_pause.patch
@@ -2,6 +2,7 @@ Subject: drop pause module and use Node.js api only
 Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2013-10-26
 Forwarded: not-needed, upstream want nodejs < 0.10 compat
+ https://github.com/jaredhanson/passport/pull/106
 --- a/lib/passport/strategies/session.js
 +++ b/lib/passport/strategies/session.js
 @@ -1,8 +1,7 @@
@@ -14,12 +15,11 @@ Forwarded: not-needed, upstream want nodejs < 0.10 compat
    , Strategy = require('../strategy');
  
  
-@@ -45,22 +44,22 @@
+@@ -45,23 +44,16 @@
      //       listening for events emitted from request.  For discussion on the
      //       matter, refer to: https://github.com/jaredhanson/passport/pull/106
      
 -    var paused = options.pauseStream ? pause(req) : null;
-+    if (options.pauseStream) req.pause();
      req._passport.instance.deserializeUser(su, function(err, user) {
        if (err) { return self.error(err); }
        if (!user) {
@@ -27,9 +27,7 @@ Forwarded: not-needed, upstream want nodejs < 0.10 compat
          self.pass();
 -        if (paused) {
 -          paused.resume();
-+        if (req.paused) {
-+          req.resume();
-         }
+-        }
          return;
        };
        var property = req._passport.instance._userProperty || 'user';
@@ -37,8 +35,7 @@ Forwarded: not-needed, upstream want nodejs < 0.10 compat
        self.pass();
 -      if (paused) {
 -        paused.resume();
-+      if (req.paused) {
-+        req.resume();
-       }
+-      }
      });
    } else {
+     self.pass();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/passportjs.git