TT#9301 4.4 upstream fixes

Change-Id: I4b5af49ad7985c605649f1289fecf2a0196bcb41

debian/patches/series

@@ -1,6 +1,9 @@
 ##
 # upstream fixes
 # 4.4
+upstream/0001-tm-apply-new-updates-with-Via-with-updated-request.patch
+upstream/0002-presence-free-pointer-after-usage.patch
+upstream/0003-htable-use-custom-column-name-for-order-by-in-db-loa.patch
 #
 # upsream fixes from master
 upstream/pv-new-function-pv_evalx-dst-fmt.patch

debian/patches/upstream/0001-tm-apply-new-updates-with-Via-with-updated-request.patch

@@ -0,0 +1,25 @@
+From c5d76e3282fa49e53ee1bc6e25c6a0315f0aadcb Mon Sep 17 00:00:00 2001
+From: lazedo <luis.azedo@factorlusitano.com>
+Date: Tue, 24 Jan 2017 01:11:35 +0000
+Subject: [PATCH] tm: apply new updates with Via with updated request
+
+---
+ modules/tm/uac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/tm/uac.c b/modules/tm/uac.c
+index 8c3a485a8..93ed0c912 100644
+--- a/modules/tm/uac.c
++++ b/modules/tm/uac.c
+@@ -426,7 +426,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r,
+ 
+ 					LM_DBG("apply new updates with Via to sip msg\n");
+ 					buf1 = build_req_buf_from_sip_req(&lreq,
+-							(unsigned int*)&buf_len1, &dst, BUILD_IN_SHM);
++							(unsigned int*)&buf_len1, &request->dst, BUILD_IN_SHM);
+ 					if (likely(buf1)){
+ 						shm_free(buf);
+ 						buf = buf1;
+-- 
+2.11.0
+

debian/patches/upstream/0002-presence-free-pointer-after-usage.patch

@@ -0,0 +1,29 @@
+From d3814d47ec92091dbf524bdabaa3c1fc71ed2c80 Mon Sep 17 00:00:00 2001
+From: lazedo <luis.azedo@factorlusitano.com>
+Date: Tue, 24 Jan 2017 02:58:54 +0000
+Subject: [PATCH] presence: free pointer after usage
+
+discovered when using tlsf memory manager.
+(cherry picked from commit dc518f6973f81b71264036b138dd6293eef58ed2)
+---
+ modules/presence/notify.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules/presence/notify.c b/modules/presence/notify.c
+index 04ee88f12..9e5037517 100644
+--- a/modules/presence/notify.c
++++ b/modules/presence/notify.c
+@@ -982,9 +982,8 @@ dlg_t* ps_build_dlg_t(subs_t* subs)
+ 			pkg_free(tmp);
+ 			goto error;
+ 		}
++		td->send_sock = grep_sock_info (&host, (unsigned short) port, (unsigned short) proto);
+ 		pkg_free(tmp);
+-		td->send_sock = grep_sock_info (
+-			&host, (unsigned short) port, (unsigned short) proto);
+ 	}
+ 	
+ 	return td;
+-- 
+2.11.0
+

debian/patches/upstream/0003-htable-use-custom-column-name-for-order-by-in-db-loa.patch

@@ -0,0 +1,27 @@
+From bd8ca7573c3b840846f346a97de927fec2d04d6b Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda@gmail.com>
+Date: Wed, 25 Jan 2017 14:45:51 +0100
+Subject: [PATCH] htable: use custom column name for order by in db load
+
+- reported by Sebastian Damm, GH #948
+
+(cherry picked from commit a9ffc2a1f7514a7bd4ff0e294e3bcb50d3a2bf07)
+---
+ modules/htable/ht_db.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c
+index e1ab7daa7..d5a5a548f 100644
+--- a/modules/htable/ht_db.c
++++ b/modules/htable/ht_db.c
+@@ -204,6 +204,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode)
+ 		return -1;
+ 	}
+ 	if(ht->ncols>0) {
++		db_ord = &ht->scols[0];
+ 		for(c=0; c<ht->ncols; c++) {
+ 			db_cols[c] = &ht->scols[c];
+ 		}
+-- 
+2.11.0
+