Hello community,
here is the log from the commit of package libsoup for openSUSE:Factory checked in at 2013-06-29 19:42:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsoup (Old)
and /work/SRC/openSUSE:Factory/.libsoup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsoup"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libsoup/libsoup.changes 2013-06-05 11:54:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libsoup.new/libsoup.changes 2013-06-29 19:42:55.000000000 +0200
@@ -1,0 +2,13 @@
+Tue May 28 19:54:28 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 2.43.2:
+ + Fixed an authentication error when using NTLM when connecting
+ to an https site over a proxy; the code was getting confused
+ and thinking that the 200 OK response to the CONNECT meant that
+ NTLM auth had succeeded (bgo#698728).
+ + Fixed a memory leak in SoupSocket (bg0#700472).
+ + Fixed a missing include error on some platforms (bgo#700003).
+ + Fixed warnings when running against the "dummy" TLS backend
+ (bgo#700518).
+
+-------------------------------------------------------------------
Old:
----
libsoup-2.43.1.tar.xz
New:
----
libsoup-2.43.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsoup.spec ++++++
--- /var/tmp/diff_new_pack.GdD7kC/_old 2013-06-29 19:42:56.000000000 +0200
+++ /var/tmp/diff_new_pack.GdD7kC/_new 2013-06-29 19:42:56.000000000 +0200
@@ -20,7 +20,7 @@
Summary: HTTP client/server library for GNOME
License: LGPL-2.1+
Group: Development/Libraries/GNOME
-Version: 2.43.1
+Version: 2.43.2
Release: 0
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/libsoup/2.43/%{name}-%{version}.tar.xz
++++++ libsoup-2.43.1.tar.xz -> libsoup-2.43.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/NEWS new/libsoup-2.43.2/NEWS
--- old/libsoup-2.43.1/NEWS 2013-04-30 22:41:03.000000000 +0200
+++ new/libsoup-2.43.2/NEWS 2013-05-28 18:55:58.000000000 +0200
@@ -1,3 +1,20 @@
+Changes in libsoup from 2.43.1 to 2.43.2:
+
+ * Fixed an authentication error when using NTLM when
+ connecting to an https site over a proxy; the code was
+ getting confused and thinking that the 200 OK response to
+ the CONNECT meant that NTLM auth had succeeded. [#698728,
+ Dan]
+
+ * Fixed a memory leak in SoupSocket. [#700472, Richard
+ Röjfors]
+
+ * Fixed a missing include error on some platforms [#700003,
+ Erik van Pienbroek]
+
+ * Fixed warnings when running against the "dummy" TLS backend.
+ [#700518, Dan]
+
Changes in libsoup from 2.42.1 to 2.43.1:
* Including no longer pulls in the system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/configure new/libsoup-2.43.2/configure
--- old/libsoup-2.43.1/configure 2013-04-30 22:48:36.000000000 +0200
+++ new/libsoup-2.43.2/configure 2013-05-28 18:59:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libsoup 2.43.1.
+# Generated by GNU Autoconf 2.69 for libsoup 2.43.2.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='libsoup'
PACKAGE_TARNAME='libsoup'
-PACKAGE_VERSION='2.43.1'
-PACKAGE_STRING='libsoup 2.43.1'
+PACKAGE_VERSION='2.43.2'
+PACKAGE_STRING='libsoup 2.43.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup'
PACKAGE_URL=''
@@ -1443,7 +1443,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libsoup 2.43.1 to adapt to many kinds of systems.
+\`configure' configures libsoup 2.43.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libsoup 2.43.1:";;
+ short | recursive ) echo "Configuration of libsoup 2.43.2:";;
esac
cat <<\_ACEOF
@@ -1650,7 +1650,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libsoup configure 2.43.1
+libsoup configure 2.43.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1928,7 +1928,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libsoup $as_me 2.43.1, which was
+It was created by libsoup $as_me 2.43.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2755,7 +2755,7 @@
# Define the identity of the package.
PACKAGE='libsoup'
- VERSION='2.43.1'
+ VERSION='2.43.2'
cat >>confdefs.h <<_ACEOF
@@ -2875,7 +2875,7 @@
SOUP_MAJOR_VERSION=2
SOUP_MINOR_VERSION=43
-SOUP_MICRO_VERSION=1
+SOUP_MICRO_VERSION=2
@@ -14395,7 +14395,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libsoup $as_me 2.43.1, which was
+This file was extended by libsoup $as_me 2.43.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14461,7 +14461,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libsoup config.status 2.43.1
+libsoup config.status 2.43.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/configure.ac new/libsoup-2.43.2/configure.ac
--- old/libsoup-2.43.1/configure.ac 2013-04-30 22:35:24.000000000 +0200
+++ new/libsoup-2.43.2/configure.ac 2013-05-28 18:49:51.000000000 +0200
@@ -4,7 +4,7 @@
m4_define([soup_major_version], [2])
m4_define([soup_minor_version], [43])
-m4_define([soup_micro_version], [1])
+m4_define([soup_micro_version], [2])
AC_PREREQ(2.63)
AC_INIT([libsoup],[soup_major_version.soup_minor_version.soup_micro_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ch01.html new/libsoup-2.43.2/docs/reference/html/ch01.html
--- old/libsoup-2.43.1/docs/reference/html/ch01.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ch01.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp463920"></a>Tutorial</h1></div></div></div>
+<a name="idp3681808"></a>Tutorial</h1></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libsoup-build-howto.html">Compiling with libsoup</a></span><span class="refpurpose"> — Notes on compiling</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ch02.html new/libsoup-2.43.2/docs/reference/html/ch02.html
--- old/libsoup-2.43.1/docs/reference/html/ch02.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ch02.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp466528"></a>Core API</h1></div></div></div>
+<a name="idp156320"></a>Core API</h1></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="SoupAuth.html">SoupAuth</a></span><span class="refpurpose"> — HTTP client-side authentication support</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ch03.html new/libsoup-2.43.2/docs/reference/html/ch03.html
--- old/libsoup-2.43.1/docs/reference/html/ch03.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ch03.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp3744384"></a>Additional Features</h1></div></div></div>
+<a name="idp241824"></a>Additional Features</h1></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="SoupSessionFeature.html">SoupSessionFeature</a></span><span class="refpurpose"> — Interface for miscellaneous session features</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ch04.html new/libsoup-2.43.2/docs/reference/html/ch04.html
--- old/libsoup-2.43.1/docs/reference/html/ch04.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ch04.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp24064"></a>Web Services APIs</h1></div></div></div>
+<a name="idp23824"></a>Web Services APIs</h1></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libsoup-2.4-HTML-Form-Support.html">HTML Form Support</a></span><span class="refpurpose"> — HTML form handling</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ch05.html new/libsoup-2.43.2/docs/reference/html/ch05.html
--- old/libsoup-2.43.1/docs/reference/html/ch05.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ch05.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp26464"></a>Low-level Networking API</h1></div></div></div>
+<a name="idp26176"></a>Low-level Networking API</h1></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="SoupAddress.html">SoupAddress</a></span><span class="refpurpose"> — DNS support</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/ix01.html new/libsoup-2.43.2/docs/reference/html/ix01.html
--- old/libsoup-2.43.1/docs/reference/html/ix01.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/ix01.html 2013-05-28 19:01:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp28336"></a>Index</h1></div></div></div>
+<a name="idp28048"></a>Index</h1></div></div></div>
<div class="index"><div class="indexdiv">
<h3>S</h3>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/libsoup-2.4-Version-Information.html new/libsoup-2.43.2/docs/reference/html/libsoup-2.4-Version-Information.html
--- old/libsoup-2.43.1/docs/reference/html/libsoup-2.4-Version-Information.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/libsoup-2.4-Version-Information.html 2013-05-28 19:01:37.000000000 +0200
@@ -218,7 +218,7 @@
<hr>
<div class="refsect2">
<a name="SOUP-MICRO-VERSION:CAPS"></a><h3>SOUP_MICRO_VERSION</h3>
-<pre class="programlisting">#define SOUP_MICRO_VERSION (1)
+<pre class="programlisting">#define SOUP_MICRO_VERSION (2)
</pre>
<p>
Like <a class="link" href="libsoup-2.4-Version-Information.html#soup-get-micro-version" title="soup_get_micro_version ()"><code class="function">soup_get_micro_version()</code></a>, but from the headers used at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/libsoup-2.4.devhelp2 new/libsoup-2.43.2/docs/reference/html/libsoup-2.4.devhelp2
--- old/libsoup-2.43.1/docs/reference/html/libsoup-2.4.devhelp2 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/libsoup-2.4.devhelp2 2013-05-28 19:01:37.000000000 +0200
@@ -60,21 +60,21 @@
<sub name="Annotation Glossary" link="annotation-glossary.html"/>
</chapters>
<functions>
- <keyword type="" name="Using pkg-config" link="libsoup-build-howto.html#idp7555536"/>
- <keyword type="" name="API Availability and Deprecation Warnings" link="libsoup-build-howto.html#idp7875392"/>
- <keyword type="" name="Headers" link="libsoup-build-howto.html#idp37952"/>
- <keyword type="" name="Creating a SoupSession" link="libsoup-client-howto.html#idp5442912"/>
+ <keyword type="" name="Using pkg-config" link="libsoup-build-howto.html#idp6750800"/>
+ <keyword type="" name="API Availability and Deprecation Warnings" link="libsoup-build-howto.html#idp6350000"/>
+ <keyword type="" name="Headers" link="libsoup-build-howto.html#idp36896"/>
+ <keyword type="" name="Creating a SoupSession" link="libsoup-client-howto.html#idp8387776"/>
<keyword type="" name="Session features" link="libsoup-client-howto.html#session-features"/>
- <keyword type="" name="Creating and Sending SoupMessages" link="libsoup-client-howto.html#idp5351008"/>
- <keyword type="" name="Processing the Response" link="libsoup-client-howto.html#idp5384272"/>
- <keyword type="" name="Intermediate/Automatic Processing" link="libsoup-client-howto.html#idp5397312"/>
- <keyword type="" name="Handling Authentication" link="libsoup-client-howto.html#idp5407088"/>
- <keyword type="" name="Multi-threaded usage" link="libsoup-client-howto.html#idp6665008"/>
- <keyword type="" name="Sample Programs" link="libsoup-client-howto.html#idp6675776"/>
- <keyword type="" name="Creating a SoupSession" link="libsoup-server-howto.html#idp5647360"/>
- <keyword type="" name="Adding Handlers" link="libsoup-server-howto.html#idp5313728"/>
- <keyword type="" name="Responding to Requests" link="libsoup-server-howto.html#idp5271200"/>
- <keyword type="" name="Handling Authentication" link="libsoup-server-howto.html#idp9368192"/>
+ <keyword type="" name="Creating and Sending SoupMessages" link="libsoup-client-howto.html#idp5736176"/>
+ <keyword type="" name="Processing the Response" link="libsoup-client-howto.html#idp5769360"/>
+ <keyword type="" name="Intermediate/Automatic Processing" link="libsoup-client-howto.html#idp5782400"/>
+ <keyword type="" name="Handling Authentication" link="libsoup-client-howto.html#idp5792176"/>
+ <keyword type="" name="Multi-threaded usage" link="libsoup-client-howto.html#idp5808464"/>
+ <keyword type="" name="Sample Programs" link="libsoup-client-howto.html#idp5819232"/>
+ <keyword type="" name="Creating a SoupSession" link="libsoup-server-howto.html#idp7744400"/>
+ <keyword type="" name="Adding Handlers" link="libsoup-server-howto.html#idp5581968"/>
+ <keyword type="" name="Responding to Requests" link="libsoup-server-howto.html#idp6601888"/>
+ <keyword type="" name="Handling Authentication" link="libsoup-server-howto.html#idp5859744"/>
<keyword type="" name="Introduction" link="libsoup-session-porting.html#intro"/>
<keyword type="" name="Different defaults" link="libsoup-session-porting.html#defaults"/>
<keyword type="" name="Differences in feature behavior" link="libsoup-session-porting.html#behavior"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/libsoup-build-howto.html new/libsoup-2.43.2/docs/reference/html/libsoup-build-howto.html
--- old/libsoup-2.43.1/docs/reference/html/libsoup-build-howto.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/libsoup-build-howto.html 2013-05-28 19:01:37.000000000 +0200
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect2">
-<a name="idp7555536"></a><h3>Using pkg-config</h3>
+<a name="idp6750800"></a><h3>Using pkg-config</h3>
<p>
Like other GNOME libraries, <span class="application">libsoup</span> uses
<span class="application">pkg-config</span> to provide compiler options. The
@@ -60,7 +60,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp7875392"></a><h3>API Availability and Deprecation Warnings</h3>
+<a name="idp6350000"></a><h3>API Availability and Deprecation Warnings</h3>
<p>
If you want to restrict your program to a particular
<span class="application">libsoup</span> version or range of versions, you
@@ -108,7 +108,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp37952"></a><h3>Headers</h3>
+<a name="idp36896"></a><h3>Headers</h3>
<p>
Code using <span class="application">libsoup</span> should do:
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/libsoup-client-howto.html new/libsoup-2.43.2/docs/reference/html/libsoup-client-howto.html
--- old/libsoup-2.43.1/docs/reference/html/libsoup-client-howto.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/libsoup-client-howto.html 2013-05-28 19:01:37.000000000 +0200
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect2">
-<a name="idp5442912"></a><h3>Creating a <span class="type">SoupSession</span>
+<a name="idp8387776"></a><h3>Creating a <span class="type">SoupSession</span>
</h3>
<p>
The first step in using the client API is to create a <a class="link" href="SoupSession.html" title="SoupSession"><span class="type">SoupSession</span></a>. The session object
@@ -228,7 +228,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5351008"></a><h3>Creating and Sending SoupMessages</h3>
+<a name="idp5736176"></a><h3>Creating and Sending SoupMessages</h3>
<p>
Once you have a session, you do HTTP traffic using <a class="link" href="SoupMessage.html" title="SoupMessage"><span class="type">SoupMessage</span></a>. In the simplest
case, you only need to create the message and it's ready to send:
@@ -288,7 +288,7 @@
flag.
</p>
<div class="refsect3">
-<a name="idp5363472"></a><h4>Sending a Message Synchronously</h4>
+<a name="idp5748560"></a><h4>Sending a Message Synchronously</h4>
<p>
To send a message and wait for the response, use <a class="link" href="SoupSession.html#soup-session-send-message" title="soup_session_send_message ()"><code class="function">soup_session_send_message</code></a>:
</p>
@@ -322,7 +322,7 @@
</p>
</div>
<div class="refsect3">
-<a name="idp5371728"></a><h4>Sending a Message Asynchronously</h4>
+<a name="idp5756816"></a><h4>Sending a Message Asynchronously</h4>
<p>
To send a message asynchronously, use <a class="link" href="SoupSession.html#soup-session-queue-message" title="soup_session_queue_message ()"><code class="function">soup_session_queue_message</code></a>:
</p>
@@ -383,7 +383,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5384272"></a><h3>Processing the Response</h3>
+<a name="idp5769360"></a><h3>Processing the Response</h3>
<p>
Once you have received the response from the server, synchronously or
asynchronously, you can look at the response fields in the
@@ -412,7 +412,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5397312"></a><h3>Intermediate/Automatic Processing</h3>
+<a name="idp5782400"></a><h3>Intermediate/Automatic Processing</h3>
<p>
You can also connect to various <span class="type">SoupMessage</span> signals to do
processing at intermediate stages of HTTP I/O. Eg, the <a class="link" href="SoupMessage.html#SoupMessage-got-chunk" title='The "got-chunk" signal'><code class="literal">got-chunk</code></a>
@@ -438,7 +438,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5407088"></a><h3>Handling Authentication</h3>
+<a name="idp5792176"></a><h3>Handling Authentication</h3>
<p>
<span class="type">SoupSession</span> handles most of the details of HTTP
authentication for you. If it receives a 401 ("Unauthorized") or 407
@@ -480,7 +480,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp6665008"></a><h3>Multi-threaded usage</h3>
+<a name="idp5808464"></a><h3>Multi-threaded usage</h3>
<p>
The only explicitly thread-safe operations in
<span class="application">libsoup</span> are <a class="link" href="SoupSessionSync.html" title="SoupSessionSync"><span class="type">SoupSessionSync</span></a>'s
@@ -504,7 +504,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp6675776"></a><h3>Sample Programs</h3>
+<a name="idp5819232"></a><h3>Sample Programs</h3>
<p>
A few sample programs are available in the
<span class="application">libsoup</span> sources:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/docs/reference/html/libsoup-server-howto.html new/libsoup-2.43.2/docs/reference/html/libsoup-server-howto.html
--- old/libsoup-2.43.1/docs/reference/html/libsoup-server-howto.html 2013-04-30 22:49:28.000000000 +0200
+++ new/libsoup-2.43.2/docs/reference/html/libsoup-server-howto.html 2013-05-28 19:01:37.000000000 +0200
@@ -29,7 +29,7 @@
<td valign="top" align="right"></td>
</tr></table></div>
<div class="refsect2">
-<a name="idp5647360"></a><h3>Creating a SoupSession</h3>
+<a name="idp7744400"></a><h3>Creating a SoupSession</h3>
<p>
As with the client API, there is a single object that will encapsulate
most of your interactions with libsoup. In this case, <a class="link" href="SoupServer.html" title="SoupServer"><span class="type">SoupServer</span></a>.
@@ -102,7 +102,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5313728"></a><h3>Adding Handlers</h3>
+<a name="idp5581968"></a><h3>Adding Handlers</h3>
<p>
By default, <a class="link" href="SoupServer.html" title="SoupServer"><span class="type">SoupServer</span></a>
returns "404 Not Found" in response to all requests (except ones that
@@ -141,7 +141,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp5271200"></a><h3>Responding to Requests</h3>
+<a name="idp6601888"></a><h3>Responding to Requests</h3>
<p>
A handler callback looks something like this:
</p>
@@ -204,7 +204,7 @@
<code class="literal">chunked</code> encoding.
</p>
<div class="refsect3">
-<a name="idp9345472"></a><h4>Responding with <code class="literal">Content-Length</code>
+<a name="idp5836944"></a><h4>Responding with <code class="literal">Content-Length</code>
Encoding</h4>
<p>
This is the simpler way to set a response body, if you have all of the
@@ -283,7 +283,7 @@
</div>
<div class="refsect3">
-<a name="idp9349312"></a><h4>Responding with <code class="literal">chunked</code> Encoding</h4>
+<a name="idp5840784"></a><h4>Responding with <code class="literal">chunked</code> Encoding</h4>
<p>
If you want to supply the response body in chunks as it becomes
available, use <code class="literal">chunked</code> encoding instead. In this
@@ -317,7 +317,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="idp9368192"></a><h3>Handling Authentication</h3>
+<a name="idp5859744"></a><h3>Handling Authentication</h3>
<p>
To have <a class="link" href="SoupServer.html" title="SoupServer"><span class="type">SoupServer</span></a>
handle HTTP authentication for you, create a <a class="link" href="SoupAuthDomainBasic.html" title="SoupAuthDomainBasic"><span class="type">SoupAuthDomainBasic</span></a>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-auth-basic.c new/libsoup-2.43.2/libsoup/soup-auth-basic.c
--- old/libsoup-2.43.1/libsoup/soup-auth-basic.c 2013-03-10 17:57:01.000000000 +0100
+++ new/libsoup-2.43.2/libsoup/soup-auth-basic.c 2013-05-22 15:52:38.000000000 +0200
@@ -73,7 +73,7 @@
space = g_strdup (source_uri->path);
- /* Strip query and filename component */
+ /* Strip filename component */
p = strrchr (space, '/');
if (p && p != space && p[1])
*p = '\0';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-auth-manager.c new/libsoup-2.43.2/libsoup/soup-auth-manager.c
--- old/libsoup-2.43.1/libsoup/soup-auth-manager.c 2013-03-10 17:57:01.000000000 +0100
+++ new/libsoup-2.43.2/libsoup/soup-auth-manager.c 2013-05-15 19:50:52.000000000 +0200
@@ -679,13 +679,15 @@
g_mutex_lock (&priv->lock);
- auth = lookup_auth (priv, msg);
- if (auth) {
- authenticate_auth (manager, auth, msg, FALSE, FALSE, FALSE);
- if (!soup_auth_is_ready (auth, msg))
- auth = NULL;
+ if (msg->method != SOUP_METHOD_CONNECT) {
+ auth = lookup_auth (priv, msg);
+ if (auth) {
+ authenticate_auth (manager, auth, msg, FALSE, FALSE, FALSE);
+ if (!soup_auth_is_ready (auth, msg))
+ auth = NULL;
+ }
+ soup_message_set_auth (msg, auth);
}
- soup_message_set_auth (msg, auth);
auth = priv->proxy_auth;
if (auth) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-auth-ntlm.c new/libsoup-2.43.2/libsoup/soup-auth-ntlm.c
--- old/libsoup-2.43.1/libsoup/soup-auth-ntlm.c 2013-04-10 15:08:11.000000000 +0200
+++ new/libsoup-2.43.2/libsoup/soup-auth-ntlm.c 2013-05-22 15:52:43.000000000 +0200
@@ -372,7 +372,7 @@
space = g_strdup (source_uri->path);
- /* Strip query and filename component */
+ /* Strip filename component */
p = strrchr (space, '/');
if (p && p != space && p[1])
*p = '\0';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-request-file.c new/libsoup-2.43.2/libsoup/soup-request-file.c
--- old/libsoup-2.43.1/libsoup/soup-request-file.c 2013-03-10 17:57:01.000000000 +0100
+++ new/libsoup-2.43.2/libsoup/soup-request-file.c 2013-05-15 19:51:01.000000000 +0200
@@ -25,6 +25,8 @@
#include
#endif
+#include
+
#include "soup-request-file.h"
#include "soup.h"
#include "soup-directory-input-stream.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-session.c new/libsoup-2.43.2/libsoup/soup-session.c
--- old/libsoup-2.43.1/libsoup/soup-session.c 2013-04-30 22:35:00.000000000 +0200
+++ new/libsoup-2.43.2/libsoup/soup-session.c 2013-05-20 18:04:23.000000000 +0200
@@ -439,10 +439,12 @@
g_object_freeze_notify (G_OBJECT (session));
system_default = g_tls_backend_get_default_database (g_tls_backend_get_default ());
- if (priv->tlsdb == system_default || tlsdb == system_default) {
- g_object_notify (G_OBJECT (session), "ssl-use-system-ca-file");
+ if (system_default) {
+ if (priv->tlsdb == system_default || tlsdb == system_default) {
+ g_object_notify (G_OBJECT (session), "ssl-use-system-ca-file");
+ }
+ g_object_unref (system_default);
}
- g_object_unref (system_default);
if (priv->ssl_ca_file) {
g_free (priv->ssl_ca_file);
@@ -473,7 +475,7 @@
else if (priv->tlsdb == system_default)
set_tlsdb (session, NULL);
- g_object_unref (system_default);
+ g_clear_object (&system_default);
}
static void
@@ -510,11 +512,15 @@
}
set_tlsdb (session, tlsdb);
- if (tlsdb)
+ if (tlsdb) {
g_object_unref (tlsdb);
- priv->ssl_ca_file = g_strdup (ssl_ca_file);
- g_object_notify (G_OBJECT (session), "ssl-ca-file");
+ priv->ssl_ca_file = g_strdup (ssl_ca_file);
+ g_object_notify (G_OBJECT (session), "ssl-ca-file");
+ } else if (priv->ssl_ca_file) {
+ g_clear_pointer (&priv->ssl_ca_file, g_free);
+ g_object_notify (G_OBJECT (session), "ssl-ca-file");
+ }
g_object_thaw_notify (G_OBJECT (session));
}
@@ -730,7 +736,7 @@
case PROP_SSL_USE_SYSTEM_CA_FILE:
tlsdb = g_tls_backend_get_default_database (g_tls_backend_get_default ());
g_value_set_boolean (value, priv->tlsdb == tlsdb);
- g_object_unref (tlsdb);
+ g_clear_object (&tlsdb);
break;
case PROP_TLS_DATABASE:
g_value_set_object (value, priv->tlsdb);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/libsoup/soup-socket.c new/libsoup-2.43.2/libsoup/soup-socket.c
--- old/libsoup-2.43.1/libsoup/soup-socket.c 2013-04-24 17:39:50.000000000 +0200
+++ new/libsoup-2.43.2/libsoup/soup-socket.c 2013-05-21 14:51:52.000000000 +0200
@@ -1404,8 +1404,11 @@
if (!priv->gsock)
return NULL;
addr = g_socket_get_remote_address (priv->gsock, NULL);
- if (!addr || !G_IS_PROXY_ADDRESS (addr))
+ if (!addr || !G_IS_PROXY_ADDRESS (addr)) {
+ if (addr)
+ g_object_unref (addr);
return NULL;
+ }
paddr = G_PROXY_ADDRESS (addr);
if (strcmp (g_proxy_address_get_protocol (paddr), "http") != 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/tests/Makefile.am new/libsoup-2.43.2/tests/Makefile.am
--- old/libsoup-2.43.1/tests/Makefile.am 2013-04-25 17:37:59.000000000 +0200
+++ new/libsoup-2.43.2/tests/Makefile.am 2013-05-20 17:21:58.000000000 +0200
@@ -22,6 +22,7 @@
header-parsing \
misc-test \
multipart-test \
+ no-ssl-test \
ntlm-test \
proxy-test \
pull-api \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/tests/Makefile.in new/libsoup-2.43.2/tests/Makefile.in
--- old/libsoup-2.43.1/tests/Makefile.in 2013-04-30 22:48:38.000000000 +0200
+++ new/libsoup-2.43.2/tests/Makefile.in 2013-05-28 19:00:00.000000000 +0200
@@ -57,8 +57,9 @@
context-test$(EXEEXT) continue-test$(EXEEXT) \
cookies-test$(EXEEXT) date$(EXEEXT) forms-test$(EXEEXT) \
header-parsing$(EXEEXT) misc-test$(EXEEXT) \
- multipart-test$(EXEEXT) ntlm-test$(EXEEXT) proxy-test$(EXEEXT) \
- pull-api$(EXEEXT) range-test$(EXEEXT) redirect-test$(EXEEXT) \
+ multipart-test$(EXEEXT) no-ssl-test$(EXEEXT) \
+ ntlm-test$(EXEEXT) proxy-test$(EXEEXT) pull-api$(EXEEXT) \
+ range-test$(EXEEXT) redirect-test$(EXEEXT) \
requester-test$(EXEEXT) resource-test$(EXEEXT) \
session-test$(EXEEXT) server-auth-test$(EXEEXT) \
sniffing-test$(EXEEXT) socket-test$(EXEEXT) ssl-test$(EXEEXT) \
@@ -94,8 +95,9 @@
connection-test$(EXEEXT) context-test$(EXEEXT) \
continue-test$(EXEEXT) cookies-test$(EXEEXT) date$(EXEEXT) \
forms-test$(EXEEXT) header-parsing$(EXEEXT) misc-test$(EXEEXT) \
- multipart-test$(EXEEXT) ntlm-test$(EXEEXT) proxy-test$(EXEEXT) \
- pull-api$(EXEEXT) range-test$(EXEEXT) redirect-test$(EXEEXT) \
+ multipart-test$(EXEEXT) no-ssl-test$(EXEEXT) \
+ ntlm-test$(EXEEXT) proxy-test$(EXEEXT) pull-api$(EXEEXT) \
+ range-test$(EXEEXT) redirect-test$(EXEEXT) \
requester-test$(EXEEXT) resource-test$(EXEEXT) \
session-test$(EXEEXT) server-auth-test$(EXEEXT) \
sniffing-test$(EXEEXT) socket-test$(EXEEXT) ssl-test$(EXEEXT) \
@@ -155,6 +157,10 @@
multipart_test_OBJECTS = multipart-test.$(OBJEXT)
multipart_test_LDADD = $(LDADD)
multipart_test_DEPENDENCIES = libtest.la
+no_ssl_test_SOURCES = no-ssl-test.c
+no_ssl_test_OBJECTS = no-ssl-test.$(OBJEXT)
+no_ssl_test_LDADD = $(LDADD)
+no_ssl_test_DEPENDENCIES = libtest.la
ntlm_test_SOURCES = ntlm-test.c
ntlm_test_OBJECTS = ntlm-test.$(OBJEXT)
ntlm_test_LDADD = $(LDADD)
@@ -268,18 +274,18 @@
SOURCES = $(libtest_la_SOURCES) auth-test.c cache-test.c chunk-test.c \
coding-test.c connection-test.c context-test.c continue-test.c \
cookies-test.c date.c forms-test.c header-parsing.c \
- misc-test.c multipart-test.c ntlm-test.c ntlm-test-helper.c \
- proxy-test.c pull-api.c range-test.c redirect-test.c \
- requester-test.c resource-test.c server-auth-test.c \
- session-test.c sniffing-test.c socket-test.c ssl-test.c \
- streaming-test.c timeout-test.c tld-test.c uri-parsing.c \
- xmlrpc-server-test.c xmlrpc-test.c
+ misc-test.c multipart-test.c no-ssl-test.c ntlm-test.c \
+ ntlm-test-helper.c proxy-test.c pull-api.c range-test.c \
+ redirect-test.c requester-test.c resource-test.c \
+ server-auth-test.c session-test.c sniffing-test.c \
+ socket-test.c ssl-test.c streaming-test.c timeout-test.c \
+ tld-test.c uri-parsing.c xmlrpc-server-test.c xmlrpc-test.c
DIST_SOURCES = $(libtest_la_SOURCES) auth-test.c cache-test.c \
chunk-test.c coding-test.c connection-test.c context-test.c \
continue-test.c cookies-test.c date.c forms-test.c \
- header-parsing.c misc-test.c multipart-test.c ntlm-test.c \
- ntlm-test-helper.c proxy-test.c pull-api.c range-test.c \
- redirect-test.c requester-test.c resource-test.c \
+ header-parsing.c misc-test.c multipart-test.c no-ssl-test.c \
+ ntlm-test.c ntlm-test-helper.c proxy-test.c pull-api.c \
+ range-test.c redirect-test.c requester-test.c resource-test.c \
server-auth-test.c session-test.c sniffing-test.c \
socket-test.c ssl-test.c streaming-test.c timeout-test.c \
tld-test.c uri-parsing.c xmlrpc-server-test.c xmlrpc-test.c
@@ -621,6 +627,9 @@
multipart-test$(EXEEXT): $(multipart_test_OBJECTS) $(multipart_test_DEPENDENCIES) $(EXTRA_multipart_test_DEPENDENCIES)
@rm -f multipart-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(multipart_test_OBJECTS) $(multipart_test_LDADD) $(LIBS)
+no-ssl-test$(EXEEXT): $(no_ssl_test_OBJECTS) $(no_ssl_test_DEPENDENCIES) $(EXTRA_no_ssl_test_DEPENDENCIES)
+ @rm -f no-ssl-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(no_ssl_test_OBJECTS) $(no_ssl_test_LDADD) $(LIBS)
ntlm-test$(EXEEXT): $(ntlm_test_OBJECTS) $(ntlm_test_DEPENDENCIES) $(EXTRA_ntlm_test_DEPENDENCIES)
@rm -f ntlm-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ntlm_test_OBJECTS) $(ntlm_test_LDADD) $(LIBS)
@@ -698,6 +707,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header-parsing.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multipart-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no-ssl-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm-test-helper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm-test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy-test.Po@am__quote@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/tests/multipart-test.c new/libsoup-2.43.2/tests/multipart-test.c
--- old/libsoup-2.43.1/tests/multipart-test.c 2013-03-10 17:57:01.000000000 +0100
+++ new/libsoup-2.43.2/tests/multipart-test.c 2013-05-21 16:41:46.000000000 +0200
@@ -113,12 +113,12 @@
}
if (!g_str_equal (name, "Content-Type")) {
- debug_printf (1, " expected `Content-Type' got %s\n", name);
+ debug_printf (1, " expected 'Content-Type' got %s\n", name);
errors++;
}
if (!g_str_equal (value, "multipart/x-mixed-replace; boundary=cut-here")) {
- debug_printf (1, " expected `multipart/x-mixed-replace; boundary=cut-here' got %s\n", value);
+ debug_printf (1, " expected 'multipart/x-mixed-replace; boundary=cut-here' got %s\n", value);
errors++;
}
}
@@ -293,12 +293,12 @@
check_is_next (is_next);
if (!g_str_equal (name, "Content-Type")) {
- debug_printf (1, " [0] expected `Content-Type' got %s\n", name);
+ debug_printf (1, " [0] expected 'Content-Type' got %s\n", name);
errors++;
}
if (!g_str_equal (value, "text/html")) {
- debug_printf (1, " [0] expected `text/html' got %s\n", value);
+ debug_printf (1, " [0] expected 'text/html' got %s\n", value);
errors++;
}
@@ -306,12 +306,12 @@
check_is_next (is_next);
if (!g_str_equal (name, "Content-Length")) {
- debug_printf (1, " [0] expected `Content-Length' got %s\n", name);
+ debug_printf (1, " [0] expected 'Content-Length' got %s\n", name);
errors++;
}
if (!g_str_equal (value, "30")) {
- debug_printf (1, " [0] expected `30' got %s\n", value);
+ debug_printf (1, " [0] expected '30' got %s\n", value);
errors++;
}
@@ -321,12 +321,12 @@
check_is_next (is_next);
if (!g_str_equal (name, "Content-Length")) {
- debug_printf (1, " [1] expected `Content-Length' got %s\n", name);
+ debug_printf (1, " [1] expected 'Content-Length' got %s\n", name);
errors++;
}
if (!g_str_equal (value, "10")) {
- debug_printf (1, " [1] expected `10' got %s\n", value);
+ debug_printf (1, " [1] expected '10' got %s\n", value);
errors++;
}
@@ -337,12 +337,12 @@
check_is_next (is_next);
if (!g_str_equal (name, "Content-Type")) {
- debug_printf (1, " [%d] expected `Content-Type' got %s\n", passes, name);
+ debug_printf (1, " [%d] expected 'Content-Type' got %s\n", passes, name);
errors++;
}
if (!g_str_equal (value, "text/css")) {
- debug_printf (1, " [%d] expected `text/html' got %s\n", passes, value);
+ debug_printf (1, " [%d] expected 'text/html' got %s\n", passes, value);
errors++;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/tests/no-ssl-test.c new/libsoup-2.43.2/tests/no-ssl-test.c
--- old/libsoup-2.43.1/tests/no-ssl-test.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libsoup-2.43.2/tests/no-ssl-test.c 2013-05-20 19:50:43.000000000 +0200
@@ -0,0 +1,199 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+#include "test-utils.h"
+
+static void
+do_ssl_test_for_session (SoupSession *session, char *uri)
+{
+ SoupMessage *msg;
+ GTlsCertificate *cert;
+ GTlsCertificateFlags flags;
+
+ msg = soup_message_new ("GET", uri);
+ soup_session_send_message (session, msg);
+ if (msg->status_code != SOUP_STATUS_SSL_FAILED) {
+ debug_printf (1, " Unexpected status: %d %s\n",
+ msg->status_code, msg->reason_phrase);
+ errors++;
+ }
+
+ if (soup_message_get_https_status (msg, &cert, &flags)) {
+ debug_printf (1, " get_http_status() returned TRUE? (flags %x)\n", flags);
+ errors++;
+ if (cert) {
+ debug_printf (1, " Got GTlsCertificate?\n");
+ errors++;
+ }
+ }
+ if (soup_message_get_flags (msg) & SOUP_MESSAGE_CERTIFICATE_TRUSTED) {
+ debug_printf (1, " CERTIFICATE_TRUSTED set?\n");
+ errors++;
+ }
+
+ g_object_unref (msg);
+}
+
+static void
+do_ssl_tests (char *uri)
+{
+ SoupSession *session;
+
+ debug_printf (1, "\nSoupSession without SSL support\n");
+
+ debug_printf (1, " plain\n");
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ do_ssl_test_for_session (session, uri);
+ soup_test_session_abort_unref (session);
+
+ debug_printf (1, " async\n");
+ session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL);
+ do_ssl_test_for_session (session, uri);
+ soup_test_session_abort_unref (session);
+
+ debug_printf (1, " sync\n");
+ session = soup_test_session_new (SOUP_TYPE_SESSION_SYNC, NULL);
+ do_ssl_test_for_session (session, uri);
+ soup_test_session_abort_unref (session);
+}
+
+static void
+do_session_property_tests (void)
+{
+ gboolean use_system;
+ GTlsDatabase *tlsdb;
+ char *ca_file;
+ SoupSession *session;
+
+ debug_printf (1, "session properties\n");
+
+ session = soup_session_async_new ();
+
+ g_object_get (G_OBJECT (session),
+ "ssl-use-system-ca-file", &use_system,
+ "tls-database", &tlsdb,
+ "ssl-ca-file", &ca_file,
+ NULL);
+ if (use_system) {
+ debug_printf (1, " ssl-use-system-ca-file defaults to TRUE?\n");
+ errors++;
+ }
+ if (tlsdb) {
+ debug_printf (1, " tls-database set by default?\n");
+ errors++;
+ g_object_unref (tlsdb);
+ }
+ if (ca_file) {
+ debug_printf (1, " ca-file set by default?\n");
+ errors++;
+ g_free (ca_file);
+ }
+
+ g_object_set (G_OBJECT (session),
+ "ssl-use-system-ca-file", TRUE,
+ NULL);
+ g_object_get (G_OBJECT (session),
+ "ssl-use-system-ca-file", &use_system,
+ "ssl-ca-file", &ca_file,
+ NULL);
+ if (use_system) {
+ debug_printf (1, " setting ssl-use-system-ca-file did not fail\n");
+ errors++;
+ }
+ if (ca_file) {
+ debug_printf (1, " setting ssl-use-system-ca-file set ssl-ca-file\n");
+ errors++;
+ g_free (ca_file);
+ }
+
+ g_object_set (G_OBJECT (session),
+ "ssl-ca-file", SRCDIR "/test-cert.pem",
+ NULL);
+ g_object_get (G_OBJECT (session),
+ "ssl-use-system-ca-file", &use_system,
+ "tls-database", &tlsdb,
+ "ssl-ca-file", &ca_file,
+ NULL);
+ if (ca_file) {
+ debug_printf (1, " setting ssl-ca-file did not fail\n");
+ errors++;
+ g_free (ca_file);
+ }
+ if (use_system) {
+ debug_printf (1, " setting ssl-ca-file set ssl-use-system-ca-file\n");
+ errors++;
+ }
+ if (tlsdb) {
+ debug_printf (1, " setting ssl-ca-file set tls-database\n");
+ errors++;
+ g_object_unref (tlsdb);
+ }
+
+ g_object_set (G_OBJECT (session),
+ "tls-database", NULL,
+ NULL);
+ g_object_get (G_OBJECT (session),
+ "ssl-use-system-ca-file", &use_system,
+ "tls-database", &tlsdb,
+ "ssl-ca-file", &ca_file,
+ NULL);
+ if (tlsdb) {
+ debug_printf (1, " setting tls-database NULL failed\n");
+ errors++;
+ g_object_unref (tlsdb);
+ }
+ if (use_system) {
+ debug_printf (1, " setting tls-database NULL set ssl-use-system-ca-file\n");
+ errors++;
+ }
+ if (ca_file) {
+ debug_printf (1, " setting tls-database NULL set ssl-ca-file\n");
+ errors++;
+ g_free (ca_file);
+ }
+
+ soup_test_session_abort_unref (session);
+}
+
+static void
+server_handler (SoupServer *server,
+ SoupMessage *msg,
+ const char *path,
+ GHashTable *query,
+ SoupClientContext *client,
+ gpointer user_data)
+{
+ soup_message_set_status (msg, SOUP_STATUS_OK);
+ soup_message_set_response (msg, "text/plain",
+ SOUP_MEMORY_STATIC,
+ "ok\r\n", 4);
+}
+
+int
+main (int argc, char **argv)
+{
+ SoupServer *server;
+ char *uri;
+
+ /* Force this test to use the dummy TLS backend */
+ g_setenv ("GIO_USE_TLS", "dummy", TRUE);
+
+ test_init (argc, argv, NULL);
+
+ /* Make a non-SSL server and pretend that it's ssl, which is fine
+ * since we won't ever actually talk to it anyway. We don't
+ * currently test that failing to construct an SSL server works.
+ */
+ server = soup_test_server_new (TRUE);
+ soup_server_add_handler (server, NULL, server_handler, NULL, NULL);
+ uri = g_strdup_printf ("https://127.0.0.1:%u/",
+ soup_server_get_port (server));
+
+ do_session_property_tests ();
+ do_ssl_tests (uri);
+
+ g_free (uri);
+ soup_test_server_quit_unref (server);
+
+ test_cleanup ();
+ return errors != 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.43.1/tests/test-utils.c new/libsoup-2.43.2/tests/test-utils.c
--- old/libsoup-2.43.1/tests/test-utils.c 2013-04-17 23:34:52.000000000 +0200
+++ new/libsoup-2.43.2/tests/test-utils.c 2013-05-15 19:51:01.000000000 +0200
@@ -413,9 +413,10 @@
{
if (cancel_data->flags & SOUP_TEST_REQUEST_CANCEL_MESSAGE) {
SoupRequest *req = cancel_data->req;
- soup_session_cancel_message (soup_request_get_session (req),
- soup_request_http_get_message (SOUP_REQUEST_HTTP (req)),
+ SoupMessage *msg = soup_request_http_get_message (SOUP_REQUEST_HTTP (req));
+ soup_session_cancel_message (soup_request_get_session (req), msg,
SOUP_STATUS_CANCELLED);
+ g_object_unref (msg);
g_object_unref (req);
} else if (cancel_data->flags & SOUP_TEST_REQUEST_CANCEL_CANCELLABLE) {
g_cancellable_cancel (cancel_data->cancellable);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org