diff --git a/modules/httpd/doc/httpd_admin.xml b/modules/httpd/doc/httpd_admin.xml index 2bf547256f1..7bc91d62edd 100644 --- a/modules/httpd/doc/httpd_admin.xml +++ b/modules/httpd/doc/httpd_admin.xml @@ -31,7 +31,7 @@ -
+
External Libraries or Applications The following libraries or applications must be installed before diff --git a/modules/mid_registrar/save.c b/modules/mid_registrar/save.c index 4e04d1c04db..c6b3b1bffa0 100644 --- a/modules/mid_registrar/save.c +++ b/modules/mid_registrar/save.c @@ -1387,10 +1387,10 @@ static inline int save_restore_rpl_contacts(struct sip_msg *req, if (reg_mode == MID_REG_THROTTLE_CT) { /* populate extra ct stuff between "insert" and "replicate" */ ci->pre_replicate_cb = mid_reg_store_ct_data; - memcpy(&ct_data, &(struct mr_ct_data){ + ct_data = (struct mr_ct_data){ mri, &_c->uri, ctmap->expires, e_out, get_act_time(), ci->cseq - }, sizeof ct_data); + }; ci->pre_replicate_info = &ct_data; } @@ -1653,10 +1653,10 @@ static inline int save_restore_req_contacts(struct sip_msg *req, if (reg_mode == MID_REG_THROTTLE_AOR) { /* populate extra ct stuff between "insert" and "replicate" */ ci->pre_replicate_cb = mid_reg_store_ct_data; - memcpy(&ct_data, &(struct mr_ct_data){ + ct_data = (struct mr_ct_data){ mri, &_c->uri, ctmap->expires, e_out, mri->last_reg_ts, ci->cseq - }, sizeof ct_data); + }; ci->pre_replicate_info = &ct_data; } diff --git a/modules/stir_shaken/doc/stir_shaken_admin.xml b/modules/stir_shaken/doc/stir_shaken_admin.xml index 5fb8a8b26e4..7d6153b877b 100644 --- a/modules/stir_shaken/doc/stir_shaken_admin.xml +++ b/modules/stir_shaken/doc/stir_shaken_admin.xml @@ -192,8 +192,8 @@ modparam("stir_shaken", "e164_strict_mode", 1) not required. - If the parameter is set to not required but the header is present in the - message, the Date value will be used as normally to check the freshness (as + If the parameter is set to "not required" but the Date header is present in the + message, the header value will be used as normally to check the freshness (as configured in the parameter). If the Date header is indeed missing, the value of the iat claim in the PASSporT will be used instead. diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c index 7c26938de4b..b9dddd828b2 100644 --- a/modules/usrloc/dlist.c +++ b/modules/usrloc/dlist.c @@ -888,7 +888,7 @@ int get_domain_ucontacts(udomain_t *d, void *buf, int len, unsigned int flags, * \return 0 if everything went OK, otherwise value < 0 is returned * * \note The structure is NOT created in shared memory so the - * function must be called before ser forks if it should + * function must be called before the fork phase if it should * be available to all processes */ static inline int new_dlist(str* _n, dlist_t** _d) @@ -900,7 +900,7 @@ static inline int new_dlist(str* _n, dlist_t** _d) return -1; } - /* Domains are created before ser forks, + /* Domains are created before the fork phase, * so we can create them using pkg_malloc */ ptr = (dlist_t*)shm_malloc(sizeof(dlist_t)); diff --git a/ut.h b/ut.h index ccb8c525c63..58863db0743 100644 --- a/ut.h +++ b/ut.h @@ -787,7 +787,7 @@ static inline int shm_nt_str_dup(str* dst, const str* src) return 0; } - dst->s = shm_malloc(src->len + 1); + dst->s = shm_malloc(_src.len + 1); if (!dst->s) { LM_ERR("no shared memory left\n"); dst->len = 0; @@ -1397,7 +1397,7 @@ static inline void * l_memmem(const void *b1, const void *b2, * Note: makes use of a single, static buffer -- use accordingly! */ char *db_url_escape(const str *url); -static inline char *_db_url_escape(char *url) +static inline char *_db_url_escape(const char *url) { return db_url_escape(_str(url)); }