Merge 822c398655 into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

conf/vanilla/autoload_configs/httapi.conf.xml

@@ -28,20 +28,20 @@
 	<permission name="set-params" value="true"/>
 	<permission name="set-vars" value="false">
 	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
+	  <!-- type attr can be "deny" or "allow". Nothing defaults to opposite of the list default, so allow in this case -->
 	  <!-- 
 	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
+	    <variable name="caller_id_name type="allow""/>
 	    <variable name="hangup"/> 
 	  </variable-list>
 	  -->
 	</permission>
 	<permission name="get-vars" value="false">
 	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
+	  <!-- type attr can be "deny" or "allow". Nothing defaults to opposite of the list default, so allow in this case -->
 	  <!-- 
 	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
+	    <variable name="caller_id_name type="allow""/>
 	    <variable name="hangup"/> 
 	  </variable-list>
 	  -->
@@ -50,17 +50,17 @@
 	<permission name="execute-apps" value="true">
 	  <!-- default to "deny" or "allow" -->
 	  <application-list default="deny">
-	    <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
-	    <application name="info"/>
+	    <!-- type attr can be "deny" or "allow". Nothing defaults to opposite of the list default, so allow in this case -->
+	    <application name="info" type="allow"/>
 	    <application name="hangup"/>
 	  </application-list>
 	</permission>
-	<permission name="expand-vars-in-tag-body" value="false">
+	<permission name="expand-vars" value="false">
 	  <!-- default to "deny" or "allow" -->
-	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
+	  <!-- type attr can be "deny" or "allow". Nothing defaults to opposite of the list default, so allow in this case -->
 	  <!-- 
 	  <variable-list default="deny">
-	    <variable name="caller_id_name"/>
+	    <variable name="caller_id_name" type="allow"/>
 	    <variable name="hangup"/> 
 	  </variable-list>
 
@@ -83,7 +83,10 @@
       <params>
 	<!-- default url can be overridden by app data -->
 	<param name="gateway-url" value="http://www.freeswitch.org/api/index.cgi" />
-	
+
+	<!-- default method (GET|POST|PUT) that mod_httapi will use for making requests. This parameter can be overridden in dialplan, inside curly braces. -->
+	<param name="method" value="GET"/>
+
 	<!-- set this to provide authentication credentials to the server -->
 	<!--<param name="gateway-credentials" value="muser:mypass"/>-->
 	<!--<param name="auth-scheme" value="basic"/>-->

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
+void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
+{
+	char *err_str;
+
+	if (err && !(*err)) {
+		err_str = pgsql_handle_get_error(handle);
+
+		if (zstr(err_str)) {
+			switch_safe_free(err_str);
+			err_str = strdup((char *)"SQL ERROR!");
+		}
+
+		*err = err_str;
+	}
+}
+
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }