hyanantha Thu Oct 24 07:55:32 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/sapi/cli php_cli.c
Log:
NetWare related changes/modifications.
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.7.2.5 php4/sapi/cli/php_cli.c:1.7.2.6
--- php4/sapi/cli/php_cli.c:1.7.2.5 Thu Jun 13 04:40:33 2002
+++ php4/sapi/cli/php_cli.c Thu Oct 24 07:55:32 2002
@@ -33,6 +33,18 @@
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
+#elif defined(NETWARE)
+#ifdef NEW_LIBC
+#include <sys/timeval.h>
+#else
+#include "netware/time_nw.h"
+#endif
+/*#include "netware/signal_nw.h"*/
+/*#include "netware/env.h"*/ /* Temporary */
+/*#include <process.h>*/
+#ifdef USE_WINSOCK
+#include <novsock2.h>
+#endif
#else
#include "build-defs.h"
#endif
@@ -362,6 +374,15 @@
/* startup after we get the above ini override se we get things right */
if (php_module_startup(&cli_sapi_module)==FAILURE) {
+#ifdef NETWARE
+ /* Without the below two functions, it will leak memory!!
+ Don't know why they were not there in the first place.
+ */
+ sapi_shutdown();
+#ifdef ZTS
+ tsrm_shutdown();
+#endif
+#endif
return FAILURE;
}
@@ -643,6 +664,13 @@
} zend_end_try();
php_module_shutdown(TSRMLS_C);
+
+#ifdef NETWARE
+ /* Without the below function, it will leak memory!!
+ Don't know why it was not there in the first place.
+ */
+ sapi_shutdown();
+#endif
#ifdef ZTS
tsrm_shutdown();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
