From 9b3942a79a39cbb945184d536d96d56ee6af5343 Mon Sep 17 00:00:00 2001
From: Sterling Hughes <sterling@php.net>
Date: Fri, 8 Dec 2000 09:29:09 +0000
Subject: [PATCH] Fix sablotron.

Add a little beautifying of the extensions name for phpcredits() (Sablotron XSLT not Sablot).

#would somebody please add this to the release tree, thanks much!
---
 ext/sablot/CREDITS      |  2 +-
 ext/sablot/php_sablot.h |  5 +----
 ext/sablot/sablot.c     | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/ext/sablot/CREDITS b/ext/sablot/CREDITS
index d6ac245da9..27a16ce0d9 100644
--- a/ext/sablot/CREDITS
+++ b/ext/sablot/CREDITS
@@ -1,2 +1,2 @@
-Sablot
+Sablotron XSLT
 Sterling Hughes
diff --git a/ext/sablot/php_sablot.h b/ext/sablot/php_sablot.h
index e4dabd2c8f..cd5b045669 100644
--- a/ext/sablot/php_sablot.h
+++ b/ext/sablot/php_sablot.h
@@ -35,9 +35,7 @@ extern zend_module_entry sablot_module_entry;
 /* Module functions */
 PHP_MINIT_FUNCTION(sablot);
 PHP_MINFO_FUNCTION(sablot);
-
-/* Request functions */
-PHP_RSHUTDOWN_FUNCTION(sablot);
+PHP_MSHUTDOWN_FUNCTION(sablot);
 
 /* Output transformation functions */
 PHP_FUNCTION(xslt_output_begintransform);
@@ -100,7 +98,6 @@ typedef struct {
 /* Sablotron Globals */
 typedef struct {
     zval *errorHandler;
-    SablotHandle processor;
     php_sablot_error *errors;
     php_sablot_error errors_start;
 	char *output_transform_file; /* For output transformations */
diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index c84a0ccdec..8dcb10de43 100644
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -32,6 +32,7 @@
 #include "php_sablot.h"
 
 static int le_sablot;
+static SablotHandle processor;
 
 /* Functions related to PHP's list handling */
 static void _php_sablot_free_processor(zend_rsrc_list_entry *rsrc);
@@ -81,23 +82,23 @@ static zval *_php_sablot_resource_zval(long);
 
 /* Sablotron Basic Api macro's */
 #define SABLOT_BASIC_CREATE_PROCESSOR() \
-    if (SABLOTG(processor) == NULL) { \
+    if (processor == NULL) { \
         int ret = 0; \
         \
-        ret = SablotCreateProcessor(&SABLOTG(processor)); \
+        ret = SablotCreateProcessor(&processor); \
         if (ret) { \
             SABLOTG(last_errno) = ret; \
             return; \
         } \
         \
-        ret = SablotRegHandler(SABLOTG(processor), HLR_MESSAGE, (void *)&mh, (void *)NULL); \
+        ret = SablotRegHandler(processor, HLR_MESSAGE, (void *)&mh, (void *)NULL); \
         if (ret) { \
             SABLOTG(last_errno) = ret; \
             return; \
         } \
     }
 
-#define SABLOT_BASIC_HANDLE SABLOTG(processor)
+#define SABLOT_BASIC_HANDLE processor
 
 /**
  * SAX Handler structure, this defines the different functions to be
@@ -160,9 +161,9 @@ zend_module_entry sablot_module_entry = {
     "sablot",
     sablot_functions,
     PHP_MINIT(sablot),
-	NULL,
+	PHP_MSHUTDOWN(sablot),
+    NULL,
     NULL,
-    PHP_RSHUTDOWN(sablot),
     PHP_MINFO(sablot),
     STANDARD_MODULE_PROPERTIES
 };
@@ -176,18 +177,17 @@ ZEND_GET_MODULE(sablot)
 PHP_MINIT_FUNCTION(sablot)
 {
     le_sablot = zend_register_list_destructors_ex(_php_sablot_free_processor, NULL, "Sablotron XSLT", module_number);
+	processor = NULL;
 
     return SUCCESS;
 }
 
-PHP_RSHUTDOWN_FUNCTION(sablot)
+PHP_MSHUTDOWN_FUNCTION(sablot)
 {
-    SABLOTLS_FETCH();
-
-    if (SABLOTG(processor)) {
-        SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL);
-        SablotDestroyProcessor(SABLOTG(processor));
-    }
+	if (processor) {
+		SablotUnregHandler(processor, HLR_MESSAGE, NULL, NULL);
+		SablotDestroyProcessor(processor);
+	}
 
     return SUCCESS;
 }
-- 
2.50.1