kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Support GMIME 3.0"

Browse Source
This commit is contained in:
Jenkins2
2017-08-07 07:33:03 -05:00
committed by Gerrit Code Review
parent 1fde9dc7a5 123c93a77c
commit e0aed61e96
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -34584,7 +34584,7 @@ fi
fi
fi
for ver in 2.0 2.2 2.4 2.6; do
for ver in 2.0 2.2 2.4 2.6 3.0; do
if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then

2
configure.ac
View File

@@ -2558,7 +2558,7 @@ then
fi
fi
for ver in 2.0 2.2 2.4 2.6; do
for ver in 2.0 2.2 2.4 2.6 3.0; do
AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver)
if test "$PBX_GMIME" = 1; then
break;

19
res/res_http_post.c
View File

@@ -55,6 +55,9 @@
#ifdef GMIME_TYPE_CONTENT_TYPE
#define AST_GMIME_VER_24
#endif
#if GMIME_MAJOR_VERSION >= 3
#define AST_GMIME_VER_30
#endif
/* just a little structure to hold callback info for gmime */
struct mime_cbinfo {
@@ -84,7 +87,11 @@ static void post_raw(GMimePart *part, const char *post_dir, const char *fn)
stream = g_mime_stream_fs_new(fd);
#ifdef AST_GMIME_VER_30
content = g_mime_part_get_content(part);
#else
content = g_mime_part_get_content_object(part);
#endif
g_mime_data_wrapper_write_to_stream(content, stream);
g_mime_stream_flush(stream);
@@ -107,7 +114,11 @@ static GMimeMessage *parse_message(FILE *f)
g_object_unref(stream);
message = g_mime_parser_construct_message(parser);
message = g_mime_parser_construct_message(parser
#ifdef AST_GMIME_VER_30
, NULL
#endif
);
g_object_unref(parser);
@@ -486,7 +497,11 @@ static int reload(void)
static int load_module(void)
{
g_mime_init(0);
g_mime_init(
#ifndef AST_GMIME_VER_30
0
#endif
);
__ast_http_post_load(0);