cvs: php4(php_4_0_4) /ext/sablot sablot.c

sas Mon Dec 4 08:15:40 2000 EDT Branch: php_4_0_4 Modified files: /php4/ext/sablot sablot.c Log: Merged with HEAD, 1.21 Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.18 php4/ext/sablot/sablot.c:1.18.2.1 --- php4/ext/sablot/sablot.c:1.18 Fri Nov 24 08:26:35 2000 +++ php4/ext/sablot/sablot.c Mon Dec 4 08:15:39 2000 @@ -160,9 +160,9 @@ "sablot", sablot_functions, PHP_MINIT(sablot), - PHP_MSHUTDOWN(sablot), + NULL, NULL, - NULL, + PHP_RSHUTDOWN(sablot), PHP_MINFO(sablot), STANDARD_MODULE_PROPERTIES }; @@ -180,15 +180,15 @@ return SUCCESS; } -PHP_MSHUTDOWN_FUNCTION(sablot) +PHP_RSHUTDOWN_FUNCTION(sablot) { SABLOTLS_FETCH(); - + if (SABLOTG(processor)) { SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL); SablotDestroyProcessor(SABLOTG(processor)); } - + return SUCCESS; } @@ -252,7 +252,7 @@ buffer = estrndup(OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length); /* Nake sure there is data to send */ - if (strlen(buffer)) { + if (OG(active_ob_buffer).text_length) { char *args[] = {"/_xmlinput", buffer, "/_output", NULL}; @@ -1344,6 +1344,7 @@ FUNCH_FREE(handle->endDocHandler); SABLOT_FREE_ERROR_HANDLE(*handle); + efree(handle); } /* }}} */