diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-05-06 16:28:21 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-05-14 23:26:43 +0200 |
| commit | 027dd86107fc24fef2f6fea2dc7fd28c98bf4ad0 (patch) | |
| tree | 59d703ab084238354b608bab8abab9603b674bc3 | |
| parent | e9e2d068b646d479f68bc4f7959e21442a6143e8 (diff) | |
| download | php-git-027dd86107fc24fef2f6fea2dc7fd28c98bf4ad0.tar.gz | |
Dump obsolete EBCDIC support
As already suggested by Thies this code won't compile anymore, because
php3_rqst has been removed in 1999[1]. Since apparently nobody
complained about that, we assume that EBCDIC support isn't required
here, and rid the respective code.
Furthermore, the code appears to be erroneous anyway, since at least
XBM isn't a binary file format.
[1] <https://github.com/php/php-src/commit/3cd0af11eea32f802228004af8fe424c62c8fbfb#diff-1a9cfc6173e3a434387996e46086da56L258>
| -rw-r--r-- | ext/gd/gd.c | 6 | ||||
| -rw-r--r-- | ext/gd/gd_ctx.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 1549fab217..9579410899 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2717,12 +2717,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); } diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c index 7e3c91c6ba..d3a7b1749c 100644 --- a/ext/gd/gd_ctx.c +++ b/ext/gd/gd_ctx.c @@ -164,12 +164,6 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, ctx->putC = _php_image_output_putc; ctx->putBuf = _php_image_output_putbuf; ctx->gd_free = _php_image_output_ctxfree; - -#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 } if (!ctx) { |