Skip to content

Commit 4fa3687

Browse files
committed
Unbundle ext/xmlrpc
According to <https://wiki.php.net/rfc/unbundle_xmlprc> we unbundle ext/xmlrpc.
1 parent 444aa26 commit 4fa3687

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+16
-12388
lines changed

CONTRIBUTING.md

-3
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ locations.
197197
└─ tokenizer/
198198
├─ tokenizer_data.c # Generated by `ext/tokenizer/tokenizer_data_gen.sh`
199199
└─ ...
200-
└─ xmlrpc/
201-
├─ libxmlrpc/ # Forked and maintained in php-src
202-
└─ ...
203200
└─ zend_test # For testing internal APIs. Not needed for regular builds.
204201
└─ ...
205202
└─ zip/ # Bundled https://github.com/pierrejoye/php_zip

EXTENSIONS

-5
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,6 @@ PRIMARY MAINTAINER: Rob Richards <[email protected]> (2004 - 2010)
214214
MAINTENANCE: Maintained
215215
STATUS: Working
216216
-------------------------------------------------------------------------------
217-
EXTENSION: xmlrpc
218-
PRIMARY MAINTAINER: Unknown
219-
MAINTENANCE: Orphaned
220-
STATUS: Experimental
221-
-------------------------------------------------------------------------------
222217
EXTENSION: xmlwriter
223218
PRIMARY MAINTAINER: Rob Richards <[email protected]> (2004 - 2010)
224219
Pierre-Alain Joye <[email protected]> (2005-2009)

README.REDIST.BINS

+15-41
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
7. ext/standard/scanf
88
8. ext/standard/strnatcmp.c
99
9. ext/standard/uuencode
10-
10. libxmlrpc ext/xmlrpc
11-
11. main/snprintf.c
12-
12. main/strlcat
13-
13. main/strlcpy
14-
14. libgd (ext/gd)
15-
15. ext/phar portions of tar implementations
16-
16. ext/phar/zip.c portion extracted from libzip
17-
17. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
18-
18. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
10+
10. main/snprintf.c
11+
11. main/strlcat
12+
12. main/strlcpy
13+
13. libgd (ext/gd)
14+
14. ext/phar portions of tar implementations
15+
15. ext/phar/zip.c portion extracted from libzip
16+
16. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
17+
17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
1918

2019

2120
3. pcre2lib (ext/pcre)
@@ -355,32 +354,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
355354
SUCH DAMAGE.
356355

357356

358-
10. libxmlrpc ext/xmlrpc
359-
360-
Copyright 2000 Epinions, Inc.
361-
362-
Subject to the following 3 conditions, Epinions, Inc. permits you, free
363-
of charge, to (a) use, copy, distribute, modify, perform and display this
364-
software and associated documentation files (the "Software"), and (b)
365-
permit others to whom the Software is furnished to do so as well.
366-
367-
1) The above copyright notice and this permission notice shall be included
368-
without modification in all copies or substantial portions of the
369-
Software.
370-
371-
2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
372-
ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
373-
IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
374-
PURPOSE OR NONINFRINGEMENT.
375-
376-
3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
377-
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
378-
OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
379-
NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
380-
DAMAGES.
381-
382-
383-
11. main/snprintf.c
357+
10. main/snprintf.c
384358

385359
Copyright (c) 2002, 2006 Todd C. Miller <[email protected]>
386360

@@ -455,8 +429,8 @@ SIO stdio-replacement strx_* functions by Panos Tsirigotis
455429
<[email protected]> for xinetd.
456430

457431

458-
12. main/strlcat
459-
13. main/strlcpy
432+
11. main/strlcat
433+
12. main/strlcpy
460434

461435
Copyright (c) 1998 Todd C. Miller <[email protected]>
462436
All rights reserved.
@@ -484,7 +458,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
484458
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
485459

486460

487-
14. libgd (ext/gd)
461+
13. libgd (ext/gd)
488462

489463
* Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
490464
2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under
@@ -554,7 +528,7 @@ Avenue Software Corporation for their prior contributions.
554528
END OF COPYRIGHT STATEMENT
555529

556530

557-
15. ext/phar portions of tar implementations
531+
14. ext/phar portions of tar implementations
558532

559533
portions of tar implementations in ext/phar - phar_tar_octal() are based on an
560534
implementation by Tim Kientzle from libarchive, licensed with this license:
@@ -583,7 +557,7 @@ implementation by Tim Kientzle from libarchive, licensed with this license:
583557
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
584558

585559

586-
16. ext/phar/zip.c portion extracted from libzip
560+
15. ext/phar/zip.c portion extracted from libzip
587561

588562
zip_dirent.c -- read directory entry (local or central), clean dirent
589563
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -617,7 +591,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
617591
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
618592

619593

620-
18. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
594+
16. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
621595

622596
The OpenLDAP Public License
623597
Version 2.8, 17 August 2003

azure/configure.yml

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ steps:
2929
--enable-xmlreader \
3030
--with-xsl \
3131
--with-tidy \
32-
--with-xmlrpc \
3332
--enable-sysvsem \
3433
--enable-sysvshm \
3534
--enable-shmop \

azure/i386/job.yml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
--enable-xmlreader \
4040
--with-xsl \
4141
--with-tidy \
42-
--with-xmlrpc \
4342
--enable-sysvsem \
4443
--enable-sysvshm \
4544
--enable-shmop \

azure/macos/job.yml

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
--enable-xmlreader \
4141
--with-xsl \
4242
--with-tidy=/usr/local/opt/tidyp \
43-
--with-xmlrpc \
4443
--with-libxml \
4544
--enable-sysvsem \
4645
--enable-sysvshm \

build/Makefile.gcov

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LCOV_EXCLUDES = \
1414
'$(top_srcdir)/ext/mbstring/libmbfl/*' \
1515
'$(top_srcdir)/ext/opcache/jit/libudis86/*' \
1616
'$(top_srcdir)/ext/pcre/pcre2lib/*' \
17-
'$(top_srcdir)/ext/xmlrpc/libxmlrpc/*' \
1817
'$(top_srcdir)/parse_date.re' \
1918
'$(top_srcdir)/parse_iso_intervals.re'
2019

@@ -26,8 +25,7 @@ GCOVR_EXCLUDES = \
2625
'ext/hash/sha3/.*' \
2726
'ext/mbstring/libmbfl/.*' \
2827
'ext/opcache/jit/libudis86/.*' \
29-
'ext/pcre/pcre2lib/.*' \
30-
'ext/xmlrpc/libxmlrpc/.*'
28+
'ext/pcre/pcre2lib/.*'
3129

3230
lcov: lcov-html
3331

ext/standard/credits_ext.h

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
7474
CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter");
7575
CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
7676
CREDIT_LINE("XMLReader", "Rob Richards");
77-
CREDIT_LINE("xmlrpc", "Dan Libby");
7877
CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye");
7978
CREDIT_LINE("XSL", "Christian Stocker, Rob Richards");
8079
CREDIT_LINE("Zip", "Pierre-Alain Joye, Remi Collet");

ext/xmlrpc/CREDITS

-2
This file was deleted.

ext/xmlrpc/EXPERIMENTAL

-5
This file was deleted.

ext/xmlrpc/config.m4

-103
This file was deleted.

ext/xmlrpc/config.w32

-20
This file was deleted.

ext/xmlrpc/libxmlrpc/README.md

-21
This file was deleted.

0 commit comments

Comments
 (0)