[PHP4BETA] CVS update: php4/ext/gd

Date: Monday April 26, 1999 @ 13:26 Author: zeev Update of /repository/php4/ext/gd In directory php:/tmp/cvs-serv18494/ext/gd Modified Files: gd.c php3_gd.h Log Message: * 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) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.5 php4/ext/gd/gd.c:1.6 --- php4/ext/gd/gd.c:1.5 Fri Apr 23 16:05:55 1999 +++ php4/ext/gd/gd.c Mon Apr 26 13:26:34 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.5 1999/04/23 20:05:55 zeev Exp $ */ +/* $Id: gd.c,v 1.6 1999/04/26 17:26:34 zeev Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -39,6 +39,7 @@ #include "php.h" #include "ext/standard/head.h" #include <math.h> +#include "SAPI.h" #include "php3_gd.h" #if HAVE_SYS_WAIT_H @@ -189,7 +190,8 @@ #endif } -int php3_mend_gd(void){ +int php3_mend_gd(SHUTDOWN_FUNC_ARGS) +{ GD_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(gdlib_globals); @@ -776,11 +778,13 @@ output = php3_header(); if (output) { + SLS_FETCH(); + gdImageGif (im, tmp); fseek(tmp, 0, SEEK_SET); #if APACHE && defined(CHARSET_EBCDIC) /* This is a binary file already: avoid EBCDIC->ASCII conversion */ - ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0); + ap_bsetflag(((request_rec *) SG(server_context))->connection->client, B_EBCDIC2ASCII, 0); #endif while ((b = fread(buf, 1, sizeof(buf), tmp)) > 0) { php3_write(buf, b); Index: php4/ext/gd/php3_gd.h diff -u php4/ext/gd/php3_gd.h:1.1 php4/ext/gd/php3_gd.h:1.2 --- php4/ext/gd/php3_gd.h:1.1 Fri Apr 16 20:37:06 1999 +++ php4/ext/gd/php3_gd.h Mon Apr 26 13:26:34 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php3_gd.h,v 1.1 1999/04/17 00:37:06 ssb Exp $ */ +/* $Id: php3_gd.h,v 1.2 1999/04/26 17:26:34 zeev Exp $ */ #ifndef _PHP3_GD_H #define _PHP3_GD_H @@ -49,7 +49,7 @@ /* gd.c functions */ extern void php3_info_gd(void); extern int php3_minit_gd(INIT_FUNC_ARGS); -extern int php3_mend_gd(void); +extern int php3_mend_gd(SHUTDOWN_FUNC_ARGS); extern int gdImageColorResolve(gdImagePtr, int, int, int); extern void php3_imagearc(INTERNAL_FUNCTION_PARAMETERS); extern void php3_imagechar(INTERNAL_FUNCTION_PARAMETERS); -- PHP 4 Beta