Merge branch 'master' into release

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "sip.js",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "authors": [
     "James Criscuolo <[email protected]>",
     "Eric Green <[email protected]>",

package.json

@@ -2,7 +2,7 @@
   "name": "sip.js",
   "title": "SIP.js",
   "description": "A simple, intuitive, and powerful JavaScript signaling library",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "main": "dist/sip.min.js",
   "browser": {
     "./src/environment.js": "./src/environment_browser.js"

src/Grammar/src/Grammar.pegjs

@@ -914,3 +914,17 @@ uuid          = hex8 "-" hex4 "-" hex4 "-" hex4 "-" hex12 {
 hex4          = HEXDIG HEXDIG HEXDIG HEXDIG
 hex8          = hex4 hex4
 hex12         = hex4 hex4 hex4
+
+// RFC 3420 (message/sipfrag)
+
+sipfrag = SIP_Version SP Status_Code SP Method CRLF?
+
+// RFC 3892 (Referred-By)
+
+Referred_By = ("Referred-By" / "b")  HCOLON  referrer_uri ( SEMI (referredby_id_param / generic_param))*
+
+referrer_uri = (name_addr / addr_spec)
+
+referredby_id_param = "cid" EQUAL sip_clean_msg_id
+
+sip_clean_msg_id = LDQUOT mark "@" (mark / host) RDQUOT

src/SIP.js

@@ -37,7 +37,7 @@ require('./RegisterContext')(SIP);
 SIP.SessionDescriptionHandler = require('./SessionDescriptionHandler')(SIP.EventEmitter);
 require('./ClientContext')(SIP);
 require('./ServerContext')(SIP);
-require('./Session')(SIP, environment);
+require('./Session')(SIP);
 require('./Subscription')(SIP);
 require('./UA')(SIP, environment);
 require('./SanityCheck')(SIP);