php3 is dead

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 108eefb9e08bbf1aef34de1ebe576be6e66e510f..66ad3c0a357550313ec4632673fc725dc289c117 100644 (file)
--- 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 e40e6096b0724bc1dbf8265694680cf202a2e63c..ff828d185862ad8fa5ca46118a598bb3ee4059a8 100644 (file)
--- 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 2b934fcae37cafbe07fe9ad6bea2758c5a776301..f50efcc0cb896e8ab5c7704d05628f984f75e910 100644 (file)
--- 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