SAPIfication, Episode VI: Return of the SAPI

Remove mostly all references to APACHE and CGI_BINARY from the code. - Apache include files are no longer included by any PHP code, except for the Apache SAPI module. - No server specific code is in any of the base PHP code. Still left to be done: - Eliminate any references to APACHE from the few remaining modules. - Move request_info.c's logic to SAPI - Modify the regex function names, and globals, so that we can always include them, without having to fear any interference with Apache; Always use the bundled regex library
mudou · Feb 10, 2000 · 6d0ab61 · 6d0ab61
1 parent 9709f7e
commit 6d0ab61
Show file tree

Hide file tree

Showing 33 changed files with 108 additions and 352 deletions.
diff --git a/acconfig.h.in b/acconfig.h.in
@@ -74,9 +74,6 @@
 /* Define if you have the sendmail program available */
 #define HAVE_SENDMAIL 0
 
-/* Define if you are compiling PHP as an Apache module */
-#define APACHE 0
-
 /* Define if you are compiling PHP as an Apache module with mod_charset patch applied (aka Russian Apache)*/
 #define USE_TRANSFER_TABLES 0
 

diff --git a/acinclude.m4 b/acinclude.m4
@@ -295,8 +295,6 @@ if test "$REGEX_TYPE" = "php"; then
   PHP_FAST_OUTPUT(regex/Makefile)
 elif test "$REGEX_TYPE" = "system"; then
   AC_DEFINE(REGEX,0)
-elif test "$REGEX_TYPE" = "apache"; then
-  AC_DEFINE(REGEX,2)
 fi
 
 AC_MSG_CHECKING(which regex library to use)

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
@@ -29,11 +29,6 @@
 #if HAVE_ASPELL
 
 #include "php_aspell.h"
-#if APACHE
-#  ifndef DEBUG
-#  undef palloc
-#  endif
-#endif
 #include <aspell-c.h>
 
 function_entry aspell_functions[] = {

diff --git a/ext/db/db.c b/ext/db/db.c
@@ -317,7 +317,7 @@ dbm_info *php_dbm_open(char *filename, char *mode) {
 #if NFS_HACK 
 		while((last_try = stat(lockfn,&sb))==0) {
 			retries++;
-			sleep(1);
+			php_sleep(1);
 			if (retries>30) break;
 		}	
 		if (last_try!=0) {

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
@@ -5,10 +5,9 @@
  * REGEX means:
  * 0.. system regex
  * 1.. bundled regex
- * 2.. Apache's regex
  */
 
-#if REGEX == 1
+#if REGEX
 /* get aliases */
 #include "regex/regex_extra.h"
 #include "regex/regex.h"

diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c
@@ -1137,7 +1137,7 @@ static int hg_read(int sockfd, char *buf, int size)
 			if ( (errno == EAGAIN) || (errno == EWOULDBLOCK) )  {
 				if ( ++try > 5 )
 					return(-1);
-				sleep(1);
+				php_sleep(1);
 			} 
 			else return(-1);
 		} 
@@ -1159,7 +1159,7 @@ static int hg_write(int sockfd, char *buf, int size)
 			if ( (errno == EAGAIN) || (errno == EWOULDBLOCK) )  {
 				if ( ++try > 5 )
 					return(-1);
-				sleep(1);
+				php_sleep(1);
 			} 
 			else return(-1);
 		} 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
@@ -158,9 +158,6 @@ PHP_MYSQL_API php_mysql_globals mysql_globals;
 DLEXPORT zend_module_entry *get_module(void) { return &mysql_module_entry; }
 #endif
 
-#if APACHE
-void timeout(int sig);
-#endif
 
 #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"MySQL:  A link to the server could not be established"); RETURN_FALSE; } }
 
@@ -187,42 +184,19 @@ static void php_mysql_set_default_link(int id)
 
 static void _close_mysql_link(MYSQL *link)
 {
-#if APACHE
-	void (*handler) (int);
-#endif
 	MySLS_FETCH();
 
-#if APACHE
-	handler = signal(SIGPIPE, SIG_IGN);
-#endif
-
 	mysql_close(link);
-
-#if APACHE
-	signal(SIGPIPE,handler);
-#endif
-
 	efree(link);
 	MySG(num_links)--;
 }
 
 static void _close_mysql_plink(MYSQL *link)
 {
-#if APACHE
-	void (*handler) (int);
-#endif
 	MySLS_FETCH();
 
-#if APACHE
-	handler = signal(SIGPIPE, SIG_IGN);
-#endif
-
 	mysql_close(link);
 
-#if APACHE
-	signal(SIGPIPE,handler);
-#endif
-
 	free(link);
 	MySG(num_persistent)--;
 	MySG(num_links)--;
@@ -338,9 +312,6 @@ PHP_MINFO_FUNCTION(mysql)
 
 static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 {
-#if APACHE
-	void (*handler) (int);
-#endif
 	char *user,*passwd,*host,*socket=NULL,*tmp;
 	char *hashed_details;
 	int hashed_details_length,port = MYSQL_PORT;
@@ -478,18 +449,12 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 				RETURN_FALSE;
 			}
 			/* ensure that the link did not die */
-#if APACHE
-			handler=signal(SIGPIPE,SIG_IGN);
-#endif
 #if defined(HAVE_MYSQL_ERRNO) && defined(CR_SERVER_GONE_ERROR)
 			mysql_stat(le->ptr);
 			if (mysql_errno((MYSQL *)le->ptr) == CR_SERVER_GONE_ERROR) {
 #else
 			if (!strcasecmp(mysql_stat(le->ptr),"mysql server has gone away")) { /* the link died */
 #endif
-#if APACHE
-				signal(SIGPIPE,handler);
-#endif
 #if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */
 				if (mysql_real_connect(le->ptr,host,user,passwd,NULL,port,socket,0)==NULL) {
 #else
@@ -501,9 +466,6 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 					RETURN_FALSE;
 				}
 			}
-#if APACHE
-			signal(SIGPIPE,handler);
-#endif
 			mysql = (MYSQL *) le->ptr;
 		}
 		ZEND_REGISTER_RESOURCE(return_value, mysql, le_plink);

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
@@ -1642,7 +1642,7 @@ oci_failover_callback(dvoid *svchp,
 		case OCI_FO_ERROR:
 			{
 				printf(" Failover error gotten. Sleeping...\n");
-				sleep(3);
+				php_sleep(3);
 				/* cannot find this blody define !!! return OCI_FO_RETRY; */
 				break;
 			}

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
@@ -132,10 +132,6 @@ zend_module_entry posix_module_entry = {
 DLEXPORT zend_module_entry *get_module(void) { return &posix__module_entry; }
 #endif
 
-#if APACHE
-void timeout(int sig);
-#endif
-
 static PHP_MINFO_FUNCTION(posix)
 {
     PUTS("$Revision$\n");

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -664,7 +664,7 @@ PHP_FUNCTION(sleep)
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(num);
-	sleep((*num)->value.lval);
+	php_sleep((*num)->value.lval);
 }
 
 PHP_FUNCTION(usleep)

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
@@ -17,6 +17,7 @@
  */
 
 #include "php.h"
+#include "php_regex.h"
 #include "php_browscap.h"
 #include "php_ini.h"
 

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -104,7 +104,7 @@ void php_dl(pval *file,int type,pval *return_value)
 	}
 
 	/* load dynamic symbol */
-	handle = dlopen(libpath, RTLD_LAZY);
+	handle = DL_LOAD(libpath);
 	if (!handle) {
 		int error_type;
 
@@ -120,10 +120,10 @@ void php_dl(pval *file,int type,pval *return_value)
 #endif
 		RETURN_FALSE;
 	}
-	get_module = (zend_module_entry *(*)(void)) dlsym(handle, "get_module");
+	get_module = (zend_module_entry *(*)(void)) DL_FETCH_SYMBOL(handle, "get_module");
 
 	if (!get_module) {
-		dlclose(handle);
+		DL_UNLOAD(handle);
 		php_error(E_CORE_WARNING,"Invalid library (maybe not a PHP library) '%s' ",file->value.str.val);
 		RETURN_FALSE;
 	}
@@ -133,7 +133,7 @@ void php_dl(pval *file,int type,pval *return_value)
 	if (module_entry->module_startup_func) {
 		if (module_entry->module_startup_func(type, module_entry->module_number ELS_CC)==FAILURE) {
 			php_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
-			dlclose(handle);
+			DL_UNLOAD(handle);
 			RETURN_FALSE;
 		}
 	}
@@ -143,7 +143,7 @@ void php_dl(pval *file,int type,pval *return_value)
 	if (module_entry->request_startup_func) {
 		if (module_entry->request_startup_func(type, module_entry->module_number ELS_CC)) {
 			php_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
-			dlclose(handle);
+			DL_UNLOAD(handle);
 			RETURN_FALSE;
 		}
 	}

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
@@ -145,27 +145,8 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
 
 
 			if (type == 1) {
-#if APACHE
-				SLS_FETCH();
-#endif
-
 				if (output) PUTS(buf);
-#if APACHE
-#  if MODULE_MAGIC_NUMBER > 19970110
-				if (output) rflush(((request_rec *) SG(server_context)));
-#  else
-				if (output) bflush(((request_rec *) SG(server_context))->connection->client);
-#  endif
-#endif
-#if CGI_BINARY
-				fflush(stdout);
-#endif
-#if FHTTPD
-                               /* fhttpd doesn't flush */
-#endif
-#if USE_SAPI
-				sapi_rqst->flush(sapi_rqst->scid);
-#endif
+				sapi_flush();
 			}
 			else if (type == 2) {
 				/* strip trailing whitespaces */