[libsoup/wip/new-master: 50/57] Remove XMLRPC support This feature does not appear to be used by any maintained project and in gener




commit 5875a4766e17ad4f9e068e0a4df0e821a3fcba62
Author: Patrick Griffis <pgriffis igalia com>
Date:   Fri Aug 28 17:25:14 2020 -0500

    Remove XMLRPC support
    This feature does not appear to be used by any maintained project
    and in general XMLRPC usage on the internet has gone down.
    
    Removing it just reduces complexity and maintainance burden.

 .gitlab-ci/Dockerfile                   |    2 -
 docs/reference/client-howto.xml         |    3 +-
 docs/reference/libsoup-2.4-docs.sgml    |    1 -
 docs/reference/libsoup-2.4-sections.txt |   28 -
 docs/reference/meson.build              |    1 -
 libsoup/Soup-2.4.metadata               |    5 -
 libsoup/include/soup-installed.h        |    1 -
 libsoup/meson.build                     |    4 -
 libsoup/soup.h                          |    1 -
 libsoup/xmlrpc/soup-xmlrpc.c            | 1478 -------------------------------
 libsoup/xmlrpc/soup-xmlrpc.h            |   95 --
 meson.build                             |   23 +-
 tests/httpd.conf.in                     |    3 -
 tests/meson.build                       |   27 -
 tests/php.ini.in                        |    1 -
 tests/xmlrpc-server-test.c              |  381 --------
 tests/xmlrpc-server.php                 |   99 ---
 tests/xmlrpc-test.c                     |  742 ----------------
 18 files changed, 2 insertions(+), 2893 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 3d481e8a..9ef72eac 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -12,8 +12,6 @@ RUN dnf update -y \
                       make \
                       meson \
                       mod_ssl \
-                      php \
-                      php-xmlrpc \
                       redhat-rpm-config \
                       samba-winbind-clients \
                       which \
diff --git a/docs/reference/client-howto.xml b/docs/reference/client-howto.xml
index 1cc190a6..f9e0327c 100644
--- a/docs/reference/client-howto.xml
+++ b/docs/reference/client-howto.xml
@@ -259,8 +259,7 @@ request headers and body of the message:
 (Although this is a bad example, because
 <application>libsoup</application> actually has convenience methods
 for dealing with <link linkend="libsoup-2.4-HTML-Form-Support">HTML
-forms</link>, as well as <link
-linkend="libsoup-2.4-XMLRPC-Support">XML-RPC</link>.)
+forms</link>.)
 </para>
 
 <para>
diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
index 36215abe..07da9241 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-2.4-docs.sgml
@@ -63,7 +63,6 @@
   <chapter>
     <title>Web Services APIs</title>
     <xi:include href="xml/soup-form.xml"/>
-    <xi:include href="xml/soup-xmlrpc.xml"/>
     <xi:include href="xml/soup-websocket.xml"/>
   </chapter>
 
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 7760c86b..9c8043a8 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -671,34 +671,6 @@ soup_form_request_new_from_hash
 soup_form_request_new_from_multipart
 </SECTION>
 
-<SECTION>
-<FILE>soup-xmlrpc</FILE>
-<TITLE>XMLRPC Support</TITLE>
-<SUBSECTION>
-SOUP_XMLRPC_ERROR
-SoupXMLRPCError
-SOUP_XMLRPC_FAULT
-SoupXMLRPCFault
-<SUBSECTION>
-soup_xmlrpc_build_request
-soup_xmlrpc_message_new
-soup_xmlrpc_parse_response
-soup_xmlrpc_variant_new_datetime
-soup_xmlrpc_variant_get_datetime
-<SUBSECTION>
-SoupXMLRPCParams
-soup_xmlrpc_params_free
-soup_xmlrpc_params_parse
-soup_xmlrpc_parse_request
-soup_xmlrpc_build_response
-soup_xmlrpc_build_fault
-soup_xmlrpc_message_set_response
-soup_xmlrpc_message_set_fault
-<SUBSECTION Private>
-soup_xmlrpc_error_quark
-soup_xmlrpc_fault_quark
-</SECTION>
-
 <SECTION>
 <FILE>soup-logger</FILE>
 <TITLE>SoupLogger</TITLE>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 724a8d92..eb6ae393 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -40,7 +40,6 @@ ignore_headers = [
   'soup-socket-private.h',
   'soup-value-utils.h',
   'soup-websocket-extension-manager-private.h',
-  'soup-xmlrpc-old.h'
 ]
 
 mkdb_args = [
diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
index c1d3d273..3fd48166 100644
--- a/libsoup/Soup-2.4.metadata
+++ b/libsoup/Soup-2.4.metadata
@@ -5,9 +5,6 @@ AuthDomain
 form_* parent="Soup.Form" name="form_(.+)"
 form_encode_datalist.form_data_set type_arguments="string"
 form_request_new_from_datalist.form_data_set type_arguments="string"
-xmlrpc_* parent="Soup.XMLRPC" name="xmlrpc_(.+)"
-XMLRPCFault errordomain parent="Soup.XMLRPC" name="Fault"
-XMLRPCError parent="Soup.XMLRPC" name="Error"
 HTTPVersion.http_* name="http_(.+)"
 
 // Report upstream
@@ -36,7 +33,6 @@ Session*.new_with_options skip=false
 URI
        .set_query_from_fields skip=false
 // uri_host_*.* type="Soup.URI"
-xmlrpc_* skip=false
 
 // Not enough GIR information
 Buffer.data type="uint8[]" array_length_field="length"
@@ -44,7 +40,6 @@ MessageBody.data type="uint8[]" array_length_field="length"
 Date
        .new_from_time_t.when type="time_t"
        .to_time_t type="time_t"
-xmlrpc_build_fault printf_format
 
 // Simplify memory management
 Buffer
diff --git a/libsoup/include/soup-installed.h b/libsoup/include/soup-installed.h
index cf08bbd2..c1e45b01 100644
--- a/libsoup/include/soup-installed.h
+++ b/libsoup/include/soup-installed.h
@@ -55,7 +55,6 @@ extern "C" {
 #include <libsoup/soup-websocket-extension.h>
 #include <libsoup/soup-websocket-extension-deflate.h>
 #include <libsoup/soup-websocket-extension-manager.h>
-#include <libsoup/soup-xmlrpc.h>
 
 #undef __SOUP_H_INSIDE__
 
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 2515ba35..8c991547 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -46,8 +46,6 @@ soup_sources = [
   'websocket/soup-websocket-extension-deflate.c',
   'websocket/soup-websocket-extension-manager.c',
 
-  'xmlrpc/soup-xmlrpc.c',
-
   'soup-body-input-stream.c',
   'soup-body-output-stream.c',
   'soup-client-input-stream.c',
@@ -123,8 +121,6 @@ soup_introspection_headers = [
   'websocket/soup-websocket-extension-deflate.h',
   'websocket/soup-websocket-extension-manager.h',
 
-  'xmlrpc/soup-xmlrpc.h',
-
   'soup-date.h',
   'soup-form.h',
   'soup-headers.h',
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 254ce582..f0511b93 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -57,7 +57,6 @@ extern "C" {
 #include "websocket/soup-websocket-extension.h"
 #include "websocket/soup-websocket-extension-deflate.h"
 #include "websocket/soup-websocket-extension-manager.h"
-#include "xmlrpc/soup-xmlrpc.h"
 
 #undef __SOUP_H_INSIDE__
 
diff --git a/meson.build b/meson.build
index 41e85a3b..dae5b2bd 100644
--- a/meson.build
+++ b/meson.build
@@ -267,28 +267,7 @@ if have_apache
   endif
 endif
 
-have_php = false
-have_php_xmlrpc = false
-if have_apache
-  php = find_program('php', required : false)
-  message(cdata.get('APACHE_PHP_MODULE_FILE'))
-  if php.found() and cdata.get('APACHE_PHP_MODULE_FILE') != ''
-    have_php = true
-    php_xmlrpc = run_command(php, '-d', 'extension=xmlrpc', '-r', 
'exit(function_exists("xmlrpc_server_create")?0:1);')
-    if php_xmlrpc.returncode() == 0
-      message('php-xmlrpc found')
-      have_php_xmlrpc = true
-      cdata.set('HAVE_PHP_XMLRPC', '1')
-    else
-      message('php-xmlrpc not found')
-    endif
-  endif
-  cdata.set('IF_HAVE_PHP', have_php ? '' : '#')
-  cdata.set('IF_HAVE_PHP_XMLRPC', have_php_xmlrpc ? '' : ';')
-endif
-
-tests_ready = have_apache and have_php and have_php_xmlrpc
-if not tests_ready
+if not have_apache
   warning('Some regression tests will not be compiled due to missing libraries or modules. Please check the 
logs for more details.')
 endif
 
diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
index 93fb7ff4..fd666b92 100644
--- a/tests/httpd.conf.in
+++ b/tests/httpd.conf.in
@@ -24,15 +24,12 @@ LoadModule authz_host_module    @APACHE_MODULE_DIR@/mod_authz_host.so
 LoadModule authz_user_module    @APACHE_MODULE_DIR@/mod_authz_user.so
 LoadModule dir_module           @APACHE_MODULE_DIR@/mod_dir.so
 LoadModule mime_module          @APACHE_MODULE_DIR@/mod_mime.so
-@IF_HAVE_PHP@LoadModule php7_module          @APACHE_PHP_MODULE_FILE@
 LoadModule proxy_module         @APACHE_MODULE_DIR@/mod_proxy.so
 LoadModule proxy_http_module    @APACHE_MODULE_DIR@/mod_proxy_http.so
 LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
 LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
 @IF_HAVE_MOD_UNIXD@LoadModule unixd_module         @APACHE_SSL_MODULE_DIR@/mod_unixd.so
 
-@IF_HAVE_PHP@PHPIniDir .
-
 DirectoryIndex index.txt
 TypesConfig /dev/null
 AddType application/x-httpd-php .php
diff --git a/tests/meson.build b/tests/meson.build
index dd227876..84e679ea 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -122,33 +122,6 @@ if have_apache
   endif
 endif
 
-if have_php
-  configure_file(output : 'php.ini',
-    input : 'php.ini.in',
-    configuration : cdata,
-    install : installed_tests_enabled,
-    install_dir : installed_tests_execdir,
-  )
-endif
-
-if have_php_xmlrpc
-  tests += [
-    ['xmlrpc-server', true, []],
-    ['xmlrpc', false, []]
-  ]
-
-  configure_file(input : 'xmlrpc-server.php',
-    output : 'xmlrpc-server.php',
-    copy : true)
-
-  if installed_tests_enabled
-    install_data(
-      'xmlrpc-server.php',
-      install_dir : installed_tests_execdir,
-    )
-  endif
-endif
-
 env = environment()
 env.set('G_TEST_SRCDIR', meson.current_source_dir())
 env.set('G_TEST_BUILDDIR', meson.current_build_dir())


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]