diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-26 17:26:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-26 17:26:37 +0000 |
| commit | 3cd0af11eea32f802228004af8fe424c62c8fbfb (patch) | |
| tree | 1d273a469ad6e9e2c7e97449fa12665e46156dbf /ext/standard/exec.c | |
| parent | 0f195a79cd25447d03eb2ad9451829b36dcaa49b (diff) | |
| download | php-git-3cd0af11eea32f802228004af8fe424c62c8fbfb.tar.gz | |
* Get the Apache module to compile again
* Get rid of php3_rqst, use SG(server_context) instead (there's still Apache-specific code,
but it nuked a global)
Diffstat (limited to 'ext/standard/exec.c')
| -rw-r--r-- | ext/standard/exec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index fe250c9985..3cd5b3a66b 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -36,6 +36,7 @@ #include "ext/standard/head.h" #include "exec.h" #include "php_globals.h" +#include "SAPI.h" #if HAVE_SYS_WAIT_H #include <sys/wait.h> @@ -118,12 +119,14 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value) if (type != 3) { while (fgets(buf, EXEC_INPUT_BUF - 1, fp)) { if (type == 1) { + SLS_FETCH(); + if (output) PUTS(buf); #if APACHE # if MODULE_MAGIC_NUMBER > 19970110 - if (output) rflush(php3_rqst); + if (output) rflush(((request_rec *) SG(server_context))); # else - if (output) bflush(php3_rqst->connection->client); + if (output) bflush(((request_rec *) SG(server_context))->connection->client); # endif #endif #if CGI_BINARY |