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

1 files changed, 2 insertions, 2 deletions

diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c
index 1138df59b6..20ed8d683e 100644
--- 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);
 		}