summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-07-12 13:58:17 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-07-12 13:58:17 +0200
commit58b607c9ea6cdc631a61b18de0cf5c0b3c96c074 (patch)
treec2aadcc2425bd33bcbf970433ef05b4e9a7f3d1a
parent8aa78659975ffecb2dbadd972e9acd69b04fb15c (diff)
downloadphp-git-58b607c9ea6cdc631a61b18de0cf5c0b3c96c074.tar.gz
Removed ext/recode
Cf. <https://wiki.php.net/rfc/unbundle_recode>.
-rw-r--r--ext/recode/CREDITS2
-rw-r--r--ext/recode/config.m461
-rw-r--r--ext/recode/config9.m414
-rw-r--r--ext/recode/php_recode.h40
-rw-r--r--ext/recode/recode.c234
-rw-r--r--ext/recode/tests/001.phpt38
-rw-r--r--ext/recode/tests/002.phpt32
-rw-r--r--ext/recode/tests/html.data1
8 files changed, 0 insertions, 422 deletions
diff --git a/ext/recode/CREDITS b/ext/recode/CREDITS
deleted file mode 100644
index aae82405ed..0000000000
--- a/ext/recode/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-Recode
-Kristian Koehntopp
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4
deleted file mode 100644
index 853b24caaa..0000000000
--- a/ext/recode/config.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-PHP_ARG_WITH([recode],
- [for recode support],
- [AS_HELP_STRING([[--with-recode[=DIR]]],
- [Include recode support])])
-
-if test "$PHP_RECODE" != "no"; then
- RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
-
- for i in $RECODE_LIST; do
- if test -f $i/include/recode.h; then
- RECODE_DIR=$i
- RECODE_INC=include
- RECODE_LIB=$PHP_LIBDIR
- fi
- if test -f $i/include/recode/recode.h; then
- RECODE_DIR=$i
- RECODE_INC=include/recode
- RECODE_LIB=$PHP_LIBDIR/recode
- fi
- if test -f $i/recode/include/recode.h; then
- RECODE_DIR=$i/recode
- RECODE_INC=include
- RECODE_LIB=$PHP_LIBDIR
- fi
- test -n "$RECODE_DIR" && break
- done
-
- if test -z "$RECODE_DIR"; then
- AC_MSG_ERROR([Can not find recode.h anywhere under $RECODE_LIST.])
- fi
-
- PHP_CHECK_LIBRARY(recode, recode_format_table,
- [
- PHP_ADD_LIBRARY_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB, RECODE_SHARED_LIBADD)
- ], [
- old_LDFLAGS=$LDFLAGS
- old_LIBS=$LIBS
- LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
- LIBS="$LIBS -lrecode"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-char *program_name;
- ]],[[
-recode_format_table();
- ]])],[
- PHP_ADD_LIBRARY_DEFER_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB, RECODE_SHARED_LIBADD)
- AC_DEFINE(HAVE_BROKEN_RECODE, 1, [Whether we have librecode 3.5])
- ],[
- AC_MSG_ERROR(I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?)
- ])
- LIBS=$old_LIBS
- LDFLAGS=$old_LDFLAGS
- ], [
- -L$RECODE_DIR/$RECODE_LIB
- ])
-
- AC_DEFINE(HAVE_LIBRECODE, 1, [Whether we have librecode 3.5 or higher])
- PHP_ADD_INCLUDE($RECODE_DIR/$RECODE_INC)
- PHP_SUBST(RECODE_SHARED_LIBADD)
- AC_CHECK_HEADERS(stdbool.h)
- PHP_NEW_EXTENSION(recode, recode.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-fi
diff --git a/ext/recode/config9.m4 b/ext/recode/config9.m4
deleted file mode 100644
index 28d852d8b0..0000000000
--- a/ext/recode/config9.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl Check for extensions with which Recode can not work
-if test "$PHP_RECODE" != "no"; then
- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap"
-
- if test -n "$MYSQL_LIBNAME"; then
- PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [
- recode_conflict="$recode_conflict mysql"
- ])
- fi
-
- if test -n "$recode_conflict"; then
- AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
- fi
-fi
diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
deleted file mode 100644
index 05f4bd9ae1..0000000000
--- a/ext/recode/php_recode.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Kristian Koehntopp <kris@koehntopp.de> |
- +----------------------------------------------------------------------+
-*/
-
-#ifndef PHP_RECODE_H
-#define PHP_RECODE_H
-
-#if HAVE_LIBRECODE
-
-extern zend_module_entry recode_module_entry;
-#define phpext_recode_ptr &recode_module_entry
-
-#include "php_version.h"
-#define PHP_RECODE_VERSION PHP_VERSION
-
-PHP_MINIT_FUNCTION(recode);
-PHP_MSHUTDOWN_FUNCTION(recode);
-PHP_MINFO_FUNCTION(recode);
-PHP_FUNCTION(recode_string);
-PHP_FUNCTION(recode_file);
-
-#else
-#define phpext_recode_ptr NULL
-#endif
-
-#endif /* PHP_RECODE_H */
diff --git a/ext/recode/recode.c b/ext/recode/recode.c
deleted file mode 100644
index 74a1f1eded..0000000000
--- a/ext/recode/recode.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Kristian Koehntopp <kris@koehntopp.de> |
- +----------------------------------------------------------------------+
- */
-
-/* {{{ includes & prototypes */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_streams.h"
-
-#if HAVE_LIBRECODE
-
-/* For recode 3.5 */
-#if HAVE_BROKEN_RECODE
-extern char *program_name;
-char *program_name = "php";
-#endif
-
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
- typedef enum {false = 0, true = 1} bool;
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <recode.h>
-
-#include "php_recode.h"
-#include "ext/standard/info.h"
-#include "ext/standard/file.h"
-#include "ext/standard/php_string.h"
-
-/* }}} */
-
-ZEND_BEGIN_MODULE_GLOBALS(recode)
- RECODE_OUTER outer;
-ZEND_END_MODULE_GLOBALS(recode)
-
-#define ReSG(v) ZEND_MODULE_GLOBALS_ACCESSOR(recode, v)
-
-ZEND_DECLARE_MODULE_GLOBALS(recode)
-static PHP_GINIT_FUNCTION(recode);
-
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_string, 0, 0, 2)
- ZEND_ARG_INFO(0, request)
- ZEND_ARG_INFO(0, str)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_file, 0, 0, 3)
- ZEND_ARG_INFO(0, request)
- ZEND_ARG_INFO(0, input)
- ZEND_ARG_INFO(0, output)
-ZEND_END_ARG_INFO()
-/* }}} */
-
-/* {{{ module stuff */
-static const zend_function_entry php_recode_functions[] = {
- PHP_FE(recode_string, arginfo_recode_string)
- PHP_FE(recode_file, arginfo_recode_file)
- PHP_FALIAS(recode, recode_string, arginfo_recode_string)
- PHP_FE_END
-}; /* }}} */
-
-zend_module_entry recode_module_entry = {
- STANDARD_MODULE_HEADER,
- "recode",
- php_recode_functions,
- PHP_MINIT(recode),
- PHP_MSHUTDOWN(recode),
- NULL,
- NULL,
- PHP_MINFO(recode),
- PHP_RECODE_VERSION,
- PHP_MODULE_GLOBALS(recode),
- PHP_GINIT(recode),
- NULL,
- NULL,
- STANDARD_MODULE_PROPERTIES_EX
-};
-
-#ifdef COMPILE_DL_RECODE
-#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE()
-#endif
-ZEND_GET_MODULE(recode)
-#endif
-
-static PHP_GINIT_FUNCTION(recode)
-{
-#if defined(COMPILE_DL_RECODE) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE();
-#endif
- recode_globals->outer = NULL;
-}
-
-PHP_MINIT_FUNCTION(recode)
-{
- ReSG(outer) = recode_new_outer(false);
- if (ReSG(outer) == NULL) {
- return FAILURE;
- }
-
- return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(recode)
-{
- if (ReSG(outer)) {
- recode_delete_outer(ReSG(outer));
- }
- return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(recode)
-{
- php_info_print_table_start();
- php_info_print_table_row(2, "Recode Support", "enabled");
- php_info_print_table_end();
-}
-
-/* {{{ proto string recode_string(string request, string str)
- Recode string str according to request string */
-PHP_FUNCTION(recode_string)
-{
- RECODE_REQUEST request = NULL;
- char *r = NULL;
- size_t r_len = 0, r_alen = 0;
- size_t req_len, str_len;
- char *req, *str;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &req, &req_len, &str, &str_len) == FAILURE) {
- return;
- }
-
- request = recode_new_request(ReSG(outer));
-
- if (request == NULL) {
- php_error_docref(NULL, E_WARNING, "Cannot allocate request structure");
- RETURN_FALSE;
- }
-
- if (!recode_scan_request(request, req)) {
- php_error_docref(NULL, E_WARNING, "Illegal recode request '%s'", req);
- goto error_exit;
- }
-
- recode_buffer_to_buffer(request, str, str_len, &r, &r_len, &r_alen);
- if (!r) {
- php_error_docref(NULL, E_WARNING, "Recoding failed.");
-error_exit:
- RETVAL_FALSE;
- } else {
- RETVAL_STRINGL(r, r_len);
- free(r);
- }
-
- recode_delete_request(request);
-
- return;
-}
-/* }}} */
-
-/* {{{ proto bool recode_file(string request, resource input, resource output)
- Recode file input into file output according to request */
-PHP_FUNCTION(recode_file)
-{
- RECODE_REQUEST request = NULL;
- char *req;
- size_t req_len;
- zval *input, *output;
- php_stream *instream, *outstream;
- FILE *in_fp, *out_fp;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "srr", &req, &req_len, &input, &output) == FAILURE) {
- return;
- }
-
- php_stream_from_zval(instream, input);
- php_stream_from_zval(outstream, output);
-
- if (FAILURE == php_stream_cast(instream, PHP_STREAM_AS_STDIO, (void**)&in_fp, REPORT_ERRORS)) {
- RETURN_FALSE;
- }
-
- if (FAILURE == php_stream_cast(outstream, PHP_STREAM_AS_STDIO, (void**)&out_fp, REPORT_ERRORS)) {
- RETURN_FALSE;
- }
-
- request = recode_new_request(ReSG(outer));
- if (request == NULL) {
- php_error_docref(NULL, E_WARNING, "Cannot allocate request structure");
- RETURN_FALSE;
- }
-
- if (!recode_scan_request(request, req)) {
- php_error_docref(NULL, E_WARNING, "Illegal recode request '%s'", req);
- goto error_exit;
- }
-
- if (!recode_file_to_file(request, in_fp, out_fp)) {
- php_error_docref(NULL, E_WARNING, "Recoding failed.");
- goto error_exit;
- }
-
- recode_delete_request(request);
- RETURN_TRUE;
-
-error_exit:
- recode_delete_request(request);
- RETURN_FALSE;
-}
-/* }}} */
-
-#endif
diff --git a/ext/recode/tests/001.phpt b/ext/recode/tests/001.phpt
deleted file mode 100644
index 62dc40a15f..0000000000
--- a/ext/recode/tests/001.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-recode_string() function - Testing string conversions between latin1, UTF-8 and html
---SKIPIF--
-<?php if (!extension_loaded("recode")) print "skip"; ?>
---FILE--
-<?php
-function ascii2hex($ascii) {
- $hex = '';
- for ($i = 0; $i < strlen($ascii); $i++) {
- $byte = dechex(ord($ascii{$i}));
- $byte = str_repeat('0', 2 - strlen($byte)).$byte;
- $hex .= $byte . " ";
- }
- return $hex;
-}
-
-function hex2ascii($hex){
- $ascii='';
- $hex=str_replace(" ", "", $hex);
- for($i=0; $i<strlen($hex); $i=$i+2) {
- $ascii .= chr(hexdec(substr($hex, $i, 2)));
- }
- return($ascii);
-}
-
-$lat1_hex_org = '31 32 33 e5 e4 f6 61 62 63';
-$utf8_hex = ascii2hex(recode_string('lat1..utf-8', hex2ascii($lat1_hex_org)));
-$html = recode_string('utf-8..html', hex2ascii($utf8_hex));
-$lat1_hex = ascii2hex(recode_string('html..lat1', $html));
-
-echo "#" . $utf8_hex . "#\n";
-echo "#" . $html . "#\n";
-echo "#" . $lat1_hex . "#\n";
-?>
---EXPECT--
-#31 32 33 c3 a5 c3 a4 c3 b6 61 62 63 #
-#123&aring;&auml;&ouml;abc#
-#31 32 33 e5 e4 f6 61 62 63 #
diff --git a/ext/recode/tests/002.phpt b/ext/recode/tests/002.phpt
deleted file mode 100644
index 8f2902551e..0000000000
--- a/ext/recode/tests/002.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-recode_string() function - Testing string conversions between latin1, UTF-8 and html
---SKIPIF--
-<?php if (!extension_loaded("recode")) print "skip"; ?>
---FILE--
-<?php
-function ascii2hex($ascii) {
- $hex = '';
- for ($i = 0; $i < strlen($ascii); $i++) {
- $byte = dechex(ord($ascii{$i}));
- $byte = str_repeat('0', 2 - strlen($byte)).$byte;
- $hex .= $byte . " ";
- }
- return $hex;
-}
-
-$html_file = fopen(realpath(__DIR__) . '/html.data', 'r');
-$utf_8_filepath = realpath(__DIR__) . '/utf8.tmp';
-$utf_8_file = fopen($utf_8_filepath, 'w+');
-
-recode_file('html..utf8', $html_file, $utf_8_file);
-
-rewind($utf_8_file);
-echo '#' . ascii2hex(fread($utf_8_file, filesize($utf_8_filepath))) . "#\n";
-
-fclose($html_file);
-fclose($utf_8_file);
-
-unlink($utf_8_filepath);
-?>
---EXPECT--
-#31 32 33 c3 a5 c3 a4 c3 b6 61 62 63 #
diff --git a/ext/recode/tests/html.data b/ext/recode/tests/html.data
deleted file mode 100644
index 64ecf1331f..0000000000
--- a/ext/recode/tests/html.data
+++ /dev/null
@@ -1 +0,0 @@
-123&aring;&auml;&ouml;abc \ No newline at end of file