diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index 5db7cfa..a892429 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,3 +1,5 @@ +2009-06-22 P. A. Bagyenda + * Minor fix: GET HTTP request shouldn't have body 2009-05-05 P. A. Bagyenda * added mmsbox-maximum-request-attempts config param 2009-05-05 P. A. Bagyenda diff --git a/mbuni/configure.ac b/mbuni/configure.ac index d4035b9..aeaa8d9 100644 --- a/mbuni/configure.ac +++ b/mbuni/configure.ac @@ -7,7 +7,7 @@ dnl dnl This program is free software, distributed under the terms of dnl the GNU General Public License, with a few exceptions granted (see LICENSE) dnl -AC_PREREQ(2.59) +AC_PREREQ(2.61) AC_INIT([mbuni],[cvs],[devel@mbuni.org]) diff --git a/mbuni/mmlib/mms_uaprof.c b/mbuni/mmlib/mms_uaprof.c index 98bed45..6a04926 100644 --- a/mbuni/mmlib/mms_uaprof.c +++ b/mbuni/mmlib/mms_uaprof.c @@ -438,7 +438,7 @@ static MmsUaProfile *profile_fetch(Octstr *profile_url) h = http_create_empty_headers(); http_header_add(h, "User-Agent", MM_NAME "/" MMSC_VERSION); - status = mms_url_fetch_content(HTTP_METHOD_GET, profile_url, h, octstr_imm(""), &rh, &body); + status = mms_url_fetch_content(HTTP_METHOD_GET, profile_url, h, NULL, &rh, &body); if (http_status_class(status) == HTTP_STATUS_SUCCESSFUL) { prof = parse_uaprofile(body); diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c index e1f1c35..24edded 100644 --- a/mbuni/mmsbox/bearerbox.c +++ b/mbuni/mmsbox/bearerbox.c @@ -106,10 +106,11 @@ static Octstr *get_dlr_notify_url(Octstr *msgid, char *report_type, Octstr *mmc_ goto done; } +#if 0 /* At what point do we delete it? For now, when we get a read report, * and also when we get a delivery report that is not 'deferred' or sent or forwarded */ -#if 0 + if (strcmp(report_type, "read-report") == 0 || (octstr_case_compare(status, octstr_imm("Deferred")) != 0 && octstr_case_compare(status, octstr_imm("Forwarded")) != 0)) diff --git a/mbuni/mmsbox/mmsbox.c b/mbuni/mmsbox/mmsbox.c index 60ce7ea..738806d 100644 --- a/mbuni/mmsbox/mmsbox.c +++ b/mbuni/mmsbox/mmsbox.c @@ -556,7 +556,7 @@ static int mmsbox_send_report(Octstr *from, char *report_type, http_header_add(rh, "X-Mbuni-UAProf", octstr_get_cstr(uaprof)); http_header_add(rh, "X-Mbuni-Timestamp", octstr_get_cstr(uaprof_tstamp)); } - ret = mms_url_fetch_content(HTTP_METHOD_GET, dlr_url, rh, octstr_imm(""), &rph, &rb); + ret = mms_url_fetch_content(HTTP_METHOD_GET, dlr_url, rh, NULL, &rph, &rb); octstr_destroy(rb); octstr_destroy(xfrom); @@ -1469,7 +1469,7 @@ static void dispatch_sendmms_recv(List *rl) http_header_add(reqh, "User-Agent", MM_NAME "/" VERSION); - if (mmsbox_url_fetch_content(HTTP_METHOD_GET, data, reqh, octstr_imm(""), &rph, &reply) == HTTP_OK) + if (mmsbox_url_fetch_content(HTTP_METHOD_GET, data, reqh, NULL, &rph, &reply) == HTTP_OK) get_content_type(rph, &ctype, ¶ms); else rb = octstr_format("failed to fetch content from url [%S]!", data);