[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.5-8-g47ccf6abd

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.2 has been updated
       via  47ccf6abd8bb07d8029d4bedc2cf9ea96180faf6 (commit)
      from  ccb42dfe4f253ff05cfa11b88d4e5bfd769bcd10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47ccf6abd8bb07d8029d4bedc2cf9ea96180faf6
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Jun 29 00:28:52 2023 -0400

    Fix previous commit. References #5385 for PostGIS 3.2.6

diff --git a/postgis/postgis_module.c b/postgis/postgis_module.c
index b084062c0..c82284b36 100644
--- a/postgis/postgis_module.c
+++ b/postgis/postgis_module.c
@@ -97,7 +97,7 @@ handleInterrupt(int sig)
   GEOS_interruptRequest();
 
 #ifdef HAVE_LIBPROTOBUF
-	/* Taking out per #5385 crash */
+  /* Taking out per #5385 crash */
   //lwgeom_wagyu_interruptRequest();
 #endif
 
@@ -108,25 +108,3 @@ handleInterrupt(int sig)
     (*coreIntHandler)(sig);
   }
 }
-<<<<<<< HEAD
-=======
-
-static void onExecutorStart(QueryDesc *queryDesc, int eflags) {
-    /* cancel interrupt requests */
-
-    GEOS_interruptCancel();
-
-#ifdef HAVE_LIBPROTOBUF
-		/* Taking out per #5385 crash */
-    //lwgeom_wagyu_interruptReset();
-#endif
-
-    lwgeom_cancel_interrupt();
-
-    if (onExecutorStartPrev) {
-        (*onExecutorStartPrev)(queryDesc, eflags);
-    } else {
-        standard_ExecutorStart(queryDesc, eflags);
-    }
-}
->>>>>>> c4d01ce30... Prevent crash in mvt

-----------------------------------------------------------------------

Summary of changes:
 postgis/postgis_module.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)


hooks/post-receive
-- 
PostGIS