Skip to content

Commit

Permalink
Broken output with SOAP API due to mixture of byte- and utf8-strings (s…
Browse files Browse the repository at this point in the history
…ympa-community#1541)

This commit also reverts a redundant fix done at 39ddf25 (sympa-community#1407)
  • Loading branch information
ikedas committed Feb 11, 2023
1 parent ea8592c commit e460aae
Show file tree
Hide file tree
Showing 5 changed files with 226 additions and 81 deletions.
9 changes: 4 additions & 5 deletions src/cgi/sympa_soap_server.fcgi.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2017, 2018, 2019 The Sympa Community. See the AUTHORS.md file at
# the top-level directory of this distribution and at
# Copyright 2017, 2018, 2019, 2023 The Sympa Community. See the
# AUTHORS.md file at the top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -39,7 +39,7 @@ use Sympa::List;
use Sympa::Log;
use Sympa::Spool::Listmaster;
use Sympa::WWW::SOAP;
use Sympa::WWW::SOAP::Transport;
use Sympa::WWW::SOAP::FastCGI;

## Load sympa config
unless (Conf::load()) {
Expand Down Expand Up @@ -81,8 +81,7 @@ my $all_lists = Sympa::List::get_lists('*');
# Soap part
##############################################################################

Sympa::WWW::SOAP::Transport->new(
cookie_expire => $Conf::Conf{'cookie_expire'})
Sympa::WWW::SOAP::FastCGI->new(cookie_expire => $Conf::Conf{'cookie_expire'})
->dispatch_with({'urn:sympasoap' => 'Sympa::WWW::SOAP'})->handle;

__END__
Expand Down
5 changes: 3 additions & 2 deletions src/lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2017, 2018, 2019, 2021, 2022 The Sympa Community. See the
# Copyright 2017, 2018, 2019, 2021, 2022, 2023 The Sympa Community. See the
# AUTHORS.md file at the top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
#
Expand Down Expand Up @@ -233,7 +233,8 @@ nonCLI_modules = \
Sympa/WWW/SharedDocument.pm \
Sympa/WWW/Session.pm \
Sympa/WWW/SOAP.pm \
Sympa/WWW/SOAP/Transport.pm \
Sympa/WWW/SOAP/FastCGI.pm \
Sympa/WWW/SOAP/Lite.pm \
Sympa/WWW/Tools.pm
nobase_modules_DATA = $(CLI_modules) $(nonCLI_modules)

Expand Down
Loading

0 comments on commit e460aae

Please sign in to comment.