Commit 379bd1a5 authored by jehan's avatar jehan
Browse files

fix macosx compilation, fix wrongly escaped / in path

parent 52862c16
......@@ -18,9 +18,10 @@ AM_INIT_AUTOMAKE
AM_SILENT_RULES(yes)
# Checks for programs.
AC_PROG_CC
dnl don't put anythingelse before AC_PROG_CC unless checking if macro still work for clang
AC_PROG_CXX(["xcrun clang++" g++])
AC_PROG_CC(["xcrun clang" gcc])
dnl because of tunnel library wrapper, C++ is required.
AC_PROG_CXX
AM_PROG_CC_C_O
dnl AC_PROG_CC_C99
......@@ -62,7 +63,7 @@ fi
STRICT_OPTIONS=" -Wall -Werror -Wno-unknown-pragmas -Wno-error=unknown-pragmas"
case "$CC" in
*xcoderun* | *clang*)
*clang*)
STRICT_OPTIONS="$STRICT_OPTIONS -Wno-error=unknown-warning-option"
;;
gcc*)
......
......@@ -1021,6 +1021,7 @@ static const char *get_generic_uri_path_noescapes() {
noescapes_add_list(noescapes, ":@&=+$,");
/*;*/
noescapes_add_list(noescapes, ";");
noescapes_add_list(noescapes, "/");
noescapes[BELLE_SIP_NO_ESCAPES_SIZE-1] = 1; // initialized
}
......
......@@ -37,6 +37,17 @@ static void test_basic_uri() {
belle_sip_object_unref(uri);
source_uri = belle_generic_uri_parse("http://www.linphone.org/");
CU_ASSERT_STRING_EQUAL(belle_generic_uri_get_path(source_uri),"/");
belle_sip_object_unref(source_uri);
source_uri = belle_generic_uri_parse("http://www.linphone.org/a/b/c");
CU_ASSERT_STRING_EQUAL(belle_generic_uri_get_path(source_uri),"/a/b/c");
CU_ASSERT_STRING_EQUAL("http://www.linphone.org/a/b/c",source_uri_raw = belle_sip_object_to_string(source_uri));
belle_sip_free(source_uri_raw);
belle_sip_object_unref(source_uri);
}
static void test_complex_uri() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment