rest_client: Improve previous commit (async timeouts)

* fix corner-case causing module timeout to be discarded
* change logging level on transfer timeout from INFO -> ERR

(cherry picked from commit 1ecb324)

modules/rest_client/rest_methods.c

@@ -879,7 +879,7 @@ static enum async_ret_code _resume_async_http_req(int fd, struct sip_msg *msg,
 	if (timed_out) {
 		char *url = NULL;
 		curl_easy_getinfo(param->handle, CURLINFO_EFFECTIVE_URL, &url);
-		LM_INFO("async %s timed out, URL: %s\n",
+		LM_ERR("async %s timed out, URL: %s\n",
 		        rest_client_method_str(param->method), url);
 		goto cleanup;
 	}

modules/tm/async.c

@@ -336,11 +336,12 @@ int t_handle_async(struct sip_msg *msg, struct action* a , int resume_route,
 			timeout = 0;
 			LM_ERR("this async function has no support for timeouts -- "
 			       "still using an infinite timeout!\n");
-		} else if (ctx->async.timeout_f && ctx->async.timeout_s
-		        && ctx->async.timeout_s < timeout) {
-			timeout = ctx->async.timeout_s;
 		}
 
+		if (ctx->async.timeout_f && ctx->async.timeout_s
+		        && (!timeout || ctx->async.timeout_s < timeout))
+			timeout = ctx->async.timeout_s;
+
 		/* place the FD + resume function (as param) into reactor */
 		if (reactor_add_reader_with_timeout( fd, F_SCRIPT_ASYNC,
 		RCT_PRIO_ASYNC, timeout, (void*)ctx)<0) {