sync up error messages between stable and master

pramsey · Feb 2, 2025 · 9ee0b64 · 9ee0b64
1 parent 174b843
commit 9ee0b64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/expected/http.out b/expected/http.out
@@ -307,7 +307,7 @@ CREATE TEMPORARY TABLE timer AS
   SELECT now() AS start;
 SELECT *
   FROM http_get(current_setting('http.server_host') || '/delay/7');
-ERROR:  HTTP request cancelled
+ERROR:  canceling statement due to user request
 SELECT round(extract(epoch FROM now() - start) * 10) AS m
   FROM timer;
  m 

diff --git a/http.c b/http.c
@@ -1383,9 +1383,7 @@ Datum http_request(PG_FUNCTION_ARGS)
 		* report back.
 		*/
 		if (http_return == CURLE_ABORTED_BY_CALLBACK)
-		{
-			elog(ERROR, "HTTP request cancelled");
-		}
+			elog(ERROR, "canceling statement due to user request");
 #endif
 
 		http_error(http_return, http_error_buffer);