Preparing for release

strophe · Nov 30, 2016 · bff9c70 · bff9c70
1 parent eb5de38
commit bff9c70
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Strophe.js Change Log
 
-## Version 1.2.10 - Unreleased
+## Version 1.2.10 - 2016-11-30
+* #172 and #215: Strophe shouldn't require `from` attribute in iq response
 * #216 Get inactivity attribute from session creation response
 * Enable session restoration for anonymous logins
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "license": "MIT",
   "main": "strophe.js",
   "authors": [

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "homepage": "http://strophe.im/strophejs",
   "repository": {
     "type": "git",

diff --git a/strophe.js b/strophe.js
@@ -846,7 +846,7 @@ Strophe = {
      *  The version of the Strophe library. Unreleased builds will have
      *  a version of head-HASH where HASH is a partial revision.
      */
-    VERSION: "1.2.9",
+    VERSION: "1.2.10",
 
     /** Constants: XMPP Namespace Constants
      *  Common namespace constants from the XMPP RFCs and XEPs.
@@ -4651,8 +4651,14 @@ Strophe.Bosh.prototype = {
                    session.rid &&
                    session.sid &&
                    session.jid &&
-                   (typeof jid === "undefined" || jid === null || Strophe.getBareJidFromJid(session.jid) == Strophe.getBareJidFromJid(jid)))
-        {
+                   (    typeof jid === "undefined" ||
+                        jid === null ||
+                        Strophe.getBareJidFromJid(session.jid) == Strophe.getBareJidFromJid(jid) ||
+                        // If authcid is null, then it's an anonymous login, so
+                        // we compare only the domains:
+                        ((Strophe.getNodeFromJid(jid) === null) && (Strophe.getDomainFromJid(session.jid) == jid))
+                    )
+        ) {
             this._conn.restored = true;
             this._attach(session.jid, session.sid, session.rid, callback, wait, hold, wind);
         } else {

diff --git a/strophe.min.js b/strophe.min.js