From a0fe9be8add2f491e7c41fbbbee565921a02acc1 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 13 Sep 2006 22:48:37 +0000 Subject: SIP methods are now compared case-sensitively (previously it was case-insensitive) because the standard says so. There's no ill effect of the old behavior, but it's still important that we do things according to what the standard says. Also a little change in string implementation (use memcmp() instead of strncmp()), an increase the version number from 0.5.7.6 to 0.5.7.7. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@713 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/include/pj/string_i.h | 6 +++--- pjlib/src/pj/config.c | 2 +- pjsip/src/pjsip/sip_msg.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pjlib/include/pj/string_i.h b/pjlib/include/pj/string_i.h index 57cae7ba..4cc3c119 100644 --- a/pjlib/include/pj/string_i.h +++ b/pjlib/include/pj/string_i.h @@ -141,7 +141,7 @@ PJ_IDEF(int) pj_strcmp( const pj_str_t *str1, const pj_str_t *str2) if (diff) { return diff > 0 ? 1 : -1; } else if (str1->ptr && str1->slen) { - return pj_ansi_strncmp(str1->ptr, str2->ptr, str1->slen); + return memcmp(str1->ptr, str2->ptr, str1->slen); } else { return 0; } @@ -151,7 +151,7 @@ PJ_IDEF(int) pj_strncmp( const pj_str_t *str1, const pj_str_t *str2, pj_size_t len) { if (str1->ptr && str2->ptr) - return pj_ansi_strncmp(str1->ptr, str2->ptr, len); + return memcmp(str1->ptr, str2->ptr, len); else if (str2->ptr) return str2->slen==0 ? 0 : -1; else if (str1->ptr) @@ -166,7 +166,7 @@ PJ_IDEF(int) pj_strncmp2( const pj_str_t *str1, const char *str2, if (len == 0) return 0; else if (str1->ptr && str2) - return pj_ansi_strncmp(str1->ptr, str2, len); + return memcmp(str1->ptr, str2, len); else if (str1->ptr) return str1->slen==0 ? 0 : 1; else if (str2) diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index 8a372524..9e74d723 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -21,7 +21,7 @@ #include static const char *id = "config.c"; -const char *PJ_VERSION = "0.5.7.6"; +const char *PJ_VERSION = "0.5.7.7"; PJ_DEF(void) pj_dump_config(void) { diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c index 72808a5c..d5eb1009 100644 --- a/pjsip/src/pjsip/sip_msg.c +++ b/pjsip/src/pjsip/sip_msg.c @@ -226,7 +226,8 @@ PJ_DEF(int) pjsip_method_cmp( const pjsip_method *m1, const pjsip_method *m2) if (m1->id == m2->id) { if (m1->id != PJSIP_OTHER_METHOD) return 0; - return pj_stricmp(&m1->name, &m2->name); + /* Method comparison is case sensitive! */ + return pj_strcmp(&m1->name, &m2->name); } return ( m1->id < m2->id ) ? -1 : 1; -- cgit v1.2.3