- Make ISAPI hook in as an extension too.

- Some work on moving stuff to SAPI.

1 files changed, 17 insertions, 4 deletions

diff --git a/main/SAPI.h b/main/SAPI.h
index bd62eaed76..feddbc3bbc 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -13,19 +13,32 @@
 #endif
 
 
-typedef struct {
+typedef struct _sapi_module_struct {
+	char *name;
+
+	int (*startup)(struct _sapi_module_struct *sapi_module);
+	int (*shutdown)(struct _sapi_module_struct *sapi_module);
+
 	int (*ub_write)(const char *str, unsigned int str_length);
-} sapi_functions_struct;
+} sapi_module_struct;
+
 
-extern sapi_functions_struct sapi_functions;  /* true global */
+extern sapi_module_struct sapi_module;  /* true global */
+
+
+typedef struct {
+	char *path_translated;
+	char *query_string;
+} sapi_request_info;
 
 
 typedef struct {
 	void *server_context;
+	sapi_request_info request_info;
 } sapi_globals_struct;
 
 
-void sapi_startup(sapi_functions_struct *sf);
+SAPI_API void sapi_startup(sapi_module_struct *sf);
 
 #ifdef ZTS
 # define SLS_D	sapi_globals_struct *sapi_globals