New release 1.2.4

Updated changelog, bumper version number and generated new dist files.

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Version 1.2.4 - Unreleased
 * #147 Support for UTF-16 encoded usernames (e.g. Chinese)
+* #162 allow empty expectedFrom according to W3C DOM 3 Specification
+* #171 Improve invalid BOSH URL handling
 
 ## Version 1.2.3 - 2015-09-01
 * Bugfix. Check if JID is null when restoring a session.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": "MIT",
   "main": "strophe.js",
   "authors": [

package.json

@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "homepage": "http://strophe.im/strophejs",
   "repository": {
     "type": "git",

release_checklist.txt

@@ -6,6 +6,7 @@
 *** Update CHANGELOG.txt
 *** Check for correct version number in package.json and bower,json
 *** Run "make release"
+*** Commit the newly generated files (mention it's a new release)
 *** Tag code with version (git tag -s vVERSION )
 *** Push repo and tags (git push && git push --tags)
 *** Add documentation to strophe.im repo

strophe.js

@@ -762,7 +762,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.3",
+    VERSION: "1.2.4",
 
     /** Constants: XMPP Namespace Constants
      *  Common namespace constants from the XMPP RFCs and XEPs.
@@ -3145,7 +3145,14 @@ Strophe.Connection.prototype = {
 
         this.connected = true;
 
-        var bodyWrap = this._proto._reqToData(req);
+        var bodyWrap;
+        try {
+            bodyWrap = this._proto._reqToData(req);
+        } catch (e) {
+            if (e != "badformat") { throw e; }
+            this._changeConnectStatus(Strophe.Status.CONNFAIL, 'bad-format');
+            this._doDisconnect('bad-format');
+        }
         if (!bodyWrap) { return; }
 
         if (this.xmlInput !== Strophe.Connection.prototype.xmlInput) {
@@ -4150,6 +4157,7 @@ Strophe.Request.prototype = {
      *
      *  Throws:
      *    "parsererror" - A parser error occured.
+     *    "badformat" - The entity has sent XML that cannot be processed.
      *
      *  Returns:
      *    The DOM element tree of the response.
@@ -4169,8 +4177,7 @@ Strophe.Request.prototype = {
         } else if (this.xhr.responseText) {
             Strophe.error("invalid response received");
             Strophe.error("responseText: " + this.xhr.responseText);
-            Strophe.error("responseXML: " +
-                          Strophe.serialize(this.xhr.responseXML));
+            throw "badformat";
         }
 
         return node;