sniper Sun Dec 4 18:24:14 2005 EDT
Modified files:
/php-src/ext/gd gd.c gd_ctx.c
Log:
php3 is dead
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.320&r2=1.321&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.320 php-src/ext/gd/gd.c:1.321
--- php-src/ext/gd/gd.c:1.320 Wed Nov 30 19:36:26 2005
+++ php-src/ext/gd/gd.c Sun Dec 4 18:24:12 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.320 2005/12/01 00:36:26 sniper Exp $ */
+/* $Id: gd.c,v 1.321 2005/12/04 23:24:12 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -604,7 +604,7 @@
}
/* }}} */
-/* Need this for cpdf. See also comment in file.c php3i_get_le_fp() */
+/* Need this for cpdf. See also comment in file.c phpi_get_le_fp() */
PHP_GD_API int phpi_get_le_gd(void)
{
return le_gd;
@@ -1801,12 +1801,6 @@
fseek(tmp, 0, SEEK_SET);
-#if APACHE && defined(CHARSET_EBCDIC)
- /* XXX this is unlikely to work any more [EMAIL PROTECTED] */
-
- /* This is a binary file already: avoid EBCDIC->ASCII
conversion */
- ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
-#endif
while ((b = fread(buf, 1, sizeof(buf), tmp)) > 0) {
php_write(buf, b TSRMLS_CC);
}
http://cvs.php.net/diff.php/php-src/ext/gd/gd_ctx.c?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/gd/gd_ctx.c
diff -u php-src/ext/gd/gd_ctx.c:1.25 php-src/ext/gd/gd_ctx.c:1.26
--- php-src/ext/gd/gd_ctx.c:1.25 Tue Nov 1 12:04:29 2005
+++ php-src/ext/gd/gd_ctx.c Sun Dec 4 18:24:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd_ctx.c,v 1.25 2005/11/01 17:04:29 sniper Exp $ */
+/* $Id: gd_ctx.c,v 1.26 2005/12/04 23:24:14 sniper Exp $ */
#include "php_gd.h"
@@ -101,11 +101,6 @@
ctx->free = _php_image_output_ctxfree;
#endif
-#if APACHE && defined(CHARSET_EBCDIC)
- /* XXX this is unlikely to work any more [EMAIL PROTECTED] */
- /* This is a binary file already: avoid EBCDIC->ASCII
conversion */
- ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
-#endif
}
switch(image_type) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
