summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-07-13 14:53:07 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-07-13 14:53:07 +0200
commit7b727607d47a93a24dc26d4ea3d12b58890383d0 (patch)
tree9bd32fbab5720234e2f97821071717641a34fd55
parent68c0c812c8e61564cc20c886e507660c5ae56f89 (diff)
parentf3cf8966be9fcbf25f5efe49640d4af409eb9864 (diff)
downloadphp-git-7b727607d47a93a24dc26d4ea3d12b58890383d0.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Remove unused recode extension artefacts
-rw-r--r--.travis.yml1
-rw-r--r--EXTENSIONS5
-rw-r--r--azure/apt.yml1
-rw-r--r--azure/i386/apt.yml1
-rw-r--r--ext/standard/credits_ext.h1
5 files changed, 0 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 3fb6e00712..20c5e704ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ addons:
- libenchant-dev
- libaspell-dev
- libpspell-dev
- - librecode-dev
- libsasl2-dev
- libxpm-dev
- libzip-dev
diff --git a/EXTENSIONS b/EXTENSIONS
index 8893cda80e..df69db55e6 100644
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -431,11 +431,6 @@ PRIMARY MAINTAINER: Unkown
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
-EXTENSION: recode
-PRIMARY MAINTAINER: Kristian Köhntopp <kris@koehntopp.de> (2000 - 2000)
-MAINTENANCE: Maintained
-STATUS: Working
--------------------------------------------------------------------------------
EXTENSION: reflection
PRIMARY MAINTAINER: Marcus Börger <helly@php.net> (2003 - 2009)
Johannes Schlüter <johannes@php.net> (2006 - 2014)
diff --git a/azure/apt.yml b/azure/apt.yml
index 5c0a9a0c55..3019d82379 100644
--- a/azure/apt.yml
+++ b/azure/apt.yml
@@ -15,7 +15,6 @@ steps:
libenchant-dev \
libaspell-dev \
libpspell-dev \
- librecode-dev \
libsasl2-dev \
libxpm-dev \
libzip-dev \
diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml
index 06f0fdbcec..07489c976c 100644
--- a/azure/i386/apt.yml
+++ b/azure/i386/apt.yml
@@ -22,7 +22,6 @@ steps:
libenchant-dev:i386 \
libaspell-dev:i386 \
libpspell-dev:i386 \
- librecode-dev:i386 \
libsasl2-dev:i386 \
libxpm-dev:i386 \
libjpeg-dev:i386 \
diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h
index cec6a63aea..55b12c8ed4 100644
--- a/ext/standard/credits_ext.h
+++ b/ext/standard/credits_ext.h
@@ -56,7 +56,6 @@ CREDIT_LINE("PostgreSQL driver for PDO", "Edin Kadribasic, Ilia Alshanetsky");
CREDIT_LINE("PostgreSQL", "Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris Kings-Lynne");
CREDIT_LINE("Pspell", "Vlad Krupin");
CREDIT_LINE("Readline", "Thies C. Arntzen");
-CREDIT_LINE("Recode", "Kristian Koehntopp");
CREDIT_LINE("Reflection", "Marcus Boerger, Timm Friebe, George Schlossnagle, Andrei Zmievski, Johannes Schlueter");
CREDIT_LINE("Sessions", "Sascha Schumann, Andrei Zmievski");
CREDIT_LINE("Shared Memory Operations", "Slava Poliakov, Ilia Alshanetsky");