summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-12-04 23:27:23 +0000
committerfoobar <sniper@php.net>2005-12-04 23:27:23 +0000
commit6f8644ce1ebf355a32c12638e1d2e18c8f2046de (patch)
tree472ae73b8364a7f4590535c9305c487cdf4ba018
parent141aecfcdd18ad544d5219a1104632881db1a48c (diff)
downloadphp-git-6f8644ce1ebf355a32c12638e1d2e18c8f2046de.tar.gz
php3 is dead
-rw-r--r--ext/gd/gd.c8
-rw-r--r--ext/gd/gd_ctx.c5
-rw-r--r--makerpm1
3 files changed, 1 insertions, 13 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 108eefb9e0..66ad3c0a35 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -604,7 +604,7 @@ PHP_FUNCTION(gd_info)
}
/* }}} */
-/* 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 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
fseek(tmp, 0, SEEK_SET);
-#if APACHE && defined(CHARSET_EBCDIC)
- /* XXX this is unlikely to work any more thies@thieso.net */
-
- /* 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);
}
diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c
index e40e6096b0..ff828d1858 100644
--- a/ext/gd/gd_ctx.c
+++ b/ext/gd/gd_ctx.c
@@ -101,11 +101,6 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
ctx->free = _php_image_output_ctxfree;
#endif
-#if APACHE && defined(CHARSET_EBCDIC)
- /* XXX this is unlikely to work any more thies@thieso.net */
- /* This is a binary file already: avoid EBCDIC->ASCII conversion */
- ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0);
-#endif
}
switch(image_type) {
diff --git a/makerpm b/makerpm
index 2b934fcae3..f50efcc0cb 100644
--- a/makerpm
+++ b/makerpm
@@ -54,7 +54,6 @@ for suExec and stand alone php scripts too.
%prep
%setup -q -n TARDIR
-#mkdir manual; cd manual && tar xzf $RPM_SOURCE_DIR/php3-manual.tar.gz
./buildconf
%build