* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/pjsip/src/test/dlg_core_test.c b/jni/pjproject-android/pjsip/src/test/dlg_core_test.c
index c661d57..ef2f35b 100644
--- a/jni/pjproject-android/pjsip/src/test/dlg_core_test.c
+++ b/jni/pjproject-android/pjsip/src/test/dlg_core_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: dlg_core_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/dns_test.c b/jni/pjproject-android/pjsip/src/test/dns_test.c
index 986b312..7f6f3b0 100644
--- a/jni/pjproject-android/pjsip/src/test/dns_test.c
+++ b/jni/pjproject-android/pjsip/src/test/dns_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: dns_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/inv_offer_answer_test.c b/jni/pjproject-android/pjsip/src/test/inv_offer_answer_test.c
index 2131ae6..7fdb11e 100644
--- a/jni/pjproject-android/pjsip/src/test/inv_offer_answer_test.c
+++ b/jni/pjproject-android/pjsip/src/test/inv_offer_answer_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: inv_offer_answer_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/main.c b/jni/pjproject-android/pjsip/src/test/main.c
index 9904bf8..423e8cb 100644
--- a/jni/pjproject-android/pjsip/src/test/main.c
+++ b/jni/pjproject-android/pjsip/src/test/main.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: main.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/msg_err_test.c b/jni/pjproject-android/pjsip/src/test/msg_err_test.c
index 3150c90..d3c5636 100644
--- a/jni/pjproject-android/pjsip/src/test/msg_err_test.c
+++ b/jni/pjproject-android/pjsip/src/test/msg_err_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msg_err_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/msg_logger.c b/jni/pjproject-android/pjsip/src/test/msg_logger.c
index ac058de..aaeda7d 100644
--- a/jni/pjproject-android/pjsip/src/test/msg_logger.c
+++ b/jni/pjproject-android/pjsip/src/test/msg_logger.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msg_logger.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/msg_test.c b/jni/pjproject-android/pjsip/src/test/msg_test.c
index bdc2046..1b2c231 100644
--- a/jni/pjproject-android/pjsip/src/test/msg_test.c
+++ b/jni/pjproject-android/pjsip/src/test/msg_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msg_test.c 4587 2013-09-05 02:14:05Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/multipart_test.c b/jni/pjproject-android/pjsip/src/test/multipart_test.c
index 4f16e68..30d6126 100644
--- a/jni/pjproject-android/pjsip/src/test/multipart_test.c
+++ b/jni/pjproject-android/pjsip/src/test/multipart_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: multipart_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjsip/src/test/regc_test.c b/jni/pjproject-android/pjsip/src/test/regc_test.c
index 17cb399..152caad 100644
--- a/jni/pjproject-android/pjsip/src/test/regc_test.c
+++ b/jni/pjproject-android/pjsip/src/test/regc_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: regc_test.c 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/test.c b/jni/pjproject-android/pjsip/src/test/test.c
index 0361e61..d10d345 100644
--- a/jni/pjproject-android/pjsip/src/test/test.c
+++ b/jni/pjproject-android/pjsip/src/test/test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: test.c 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/test.h b/jni/pjproject-android/pjsip/src/test/test.h
index 690598b..9b70435 100644
--- a/jni/pjproject-android/pjsip/src/test/test.h
+++ b/jni/pjproject-android/pjsip/src/test/test.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: test.h 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/transport_loop_test.c b/jni/pjproject-android/pjsip/src/test/transport_loop_test.c
index efa2ea1..6c60036 100644
--- a/jni/pjproject-android/pjsip/src/test/transport_loop_test.c
+++ b/jni/pjproject-android/pjsip/src/test/transport_loop_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: transport_loop_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/transport_tcp_test.c b/jni/pjproject-android/pjsip/src/test/transport_tcp_test.c
index 9024ef9..4bc8c1c 100644
--- a/jni/pjproject-android/pjsip/src/test/transport_tcp_test.c
+++ b/jni/pjproject-android/pjsip/src/test/transport_tcp_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: transport_tcp_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/transport_test.c b/jni/pjproject-android/pjsip/src/test/transport_test.c
index ab22c5e..851d5dd 100644
--- a/jni/pjproject-android/pjsip/src/test/transport_test.c
+++ b/jni/pjproject-android/pjsip/src/test/transport_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: transport_test.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/transport_udp_test.c b/jni/pjproject-android/pjsip/src/test/transport_udp_test.c
index bc0831a..3c92632 100644
--- a/jni/pjproject-android/pjsip/src/test/transport_udp_test.c
+++ b/jni/pjproject-android/pjsip/src/test/transport_udp_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: transport_udp_test.c 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/tsx_basic_test.c b/jni/pjproject-android/pjsip/src/test/tsx_basic_test.c
index baae9fd..aaeabce 100644
--- a/jni/pjproject-android/pjsip/src/test/tsx_basic_test.c
+++ b/jni/pjproject-android/pjsip/src/test/tsx_basic_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tsx_basic_test.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/tsx_bench.c b/jni/pjproject-android/pjsip/src/test/tsx_bench.c
index 2282b6a..81d543e 100644
--- a/jni/pjproject-android/pjsip/src/test/tsx_bench.c
+++ b/jni/pjproject-android/pjsip/src/test/tsx_bench.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tsx_bench.c 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/tsx_uac_test.c b/jni/pjproject-android/pjsip/src/test/tsx_uac_test.c
index d978df8..6b67d81 100644
--- a/jni/pjproject-android/pjsip/src/test/tsx_uac_test.c
+++ b/jni/pjproject-android/pjsip/src/test/tsx_uac_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tsx_uac_test.c 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/tsx_uas_test.c b/jni/pjproject-android/pjsip/src/test/tsx_uas_test.c
index 3c43f53..5d796f4 100644
--- a/jni/pjproject-android/pjsip/src/test/tsx_uas_test.c
+++ b/jni/pjproject-android/pjsip/src/test/tsx_uas_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tsx_uas_test.c 4420 2013-03-05 11:59:54Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/txdata_test.c b/jni/pjproject-android/pjsip/src/test/txdata_test.c
index f7f7365..330e49b 100644
--- a/jni/pjproject-android/pjsip/src/test/txdata_test.c
+++ b/jni/pjproject-android/pjsip/src/test/txdata_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: txdata_test.c 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/test/uri_test.c b/jni/pjproject-android/pjsip/src/test/uri_test.c
index c647764..5649a03 100644
--- a/jni/pjproject-android/pjsip/src/test/uri_test.c
+++ b/jni/pjproject-android/pjsip/src/test/uri_test.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: uri_test.c 4641 2013-11-04 09:05:43Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -83,6 +83,7 @@
 static pjsip_uri *create_uri37( pj_pool_t *pool );
 static pjsip_uri *create_uri38( pj_pool_t *pool );
 static pjsip_uri *create_uri39( pj_pool_t *pool );
+static pjsip_uri *create_uri40( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
 #define ERR_NOT_EQUAL	-1001
@@ -357,6 +358,12 @@
 	PJ_SUCCESS,
 	"\"User\\\\\" <sip:localhost>",
 	&create_uri39,
+    },
+    {
+	/* Quoted display name. */
+	PJ_SUCCESS,
+	"\"\\\"User\\\"\" <sip:localhost>",
+	&create_uri40,
     }
 
 };
@@ -781,6 +788,20 @@
     return (pjsip_uri*)name_addr;
 }
 
+/* "\"\\\"User\\\"\" <sip:localhost>" */
+static pjsip_uri *create_uri40(pj_pool_t *pool)
+{
+    pjsip_name_addr *name_addr = pjsip_name_addr_create(pool);
+    pjsip_sip_uri *url;
+
+    url = pjsip_sip_uri_create(pool, 0);
+    name_addr->uri = (pjsip_uri*) url;
+
+    pj_strdup2(pool, &name_addr->display, "\\\"User\\\"");
+    pj_strdup2(pool, &url->host, "localhost");
+    return (pjsip_uri*)name_addr;
+}
+
 static pjsip_uri *create_dummy(pj_pool_t *pool)
 {
     PJ_UNUSED_ARG(pool);