summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/reference/libsoup-2.4-docs.sgml2
-rw-r--r--docs/reference/libsoup-2.4-sections.txt12
-rw-r--r--libsoup/soup-session.c6
3 files changed, 12 insertions, 8 deletions
diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
index ec6fa0dd..7370bc44 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-2.4-docs.sgml
@@ -48,7 +48,7 @@
<chapter>
<title>Web Services APIs</title>
- <xi:include href="xml/soup-forms.xml"/>
+ <xi:include href="xml/soup-form.xml"/>
<xi:include href="xml/soup-xmlrpc.xml"/>
<xi:include href="xml/soup-value-utils.xml"/>
</chapter>
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 460e0c43..038e6b61 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -236,6 +236,7 @@ SOUP_SERVER_PORT
SOUP_SERVER_INTERFACE
SOUP_SERVER_SSL_CERT_FILE
SOUP_SERVER_SSL_KEY_FILE
+SOUP_SERVER_TLS_CERTIFICATE
SOUP_SERVER_ASYNC_CONTEXT
SOUP_SERVER_RAW_PATHS
SOUP_SERVER_SERVER_HEADER
@@ -414,6 +415,8 @@ SOUP_SESSION_MAX_CONNS
SOUP_SESSION_MAX_CONNS_PER_HOST
SOUP_SESSION_USE_NTLM
SOUP_SESSION_SSL_CA_FILE
+SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE
+SOUP_SESSION_TLS_DATABASE
SOUP_SESSION_ASYNC_CONTEXT
SOUP_SESSION_TIMEOUT
SOUP_SESSION_IDLE_TIMEOUT
@@ -426,6 +429,7 @@ SOUP_SESSION_ACCEPT_LANGUAGE_AUTO
SOUP_SESSION_SSL_STRICT
SOUP_SESSION_HTTP_ALIASES
SOUP_SESSION_HTTPS_ALIASES
+SOUP_SESSION_USE_THREAD_CONTEXT
<SUBSECTION Standard>
SOUP_IS_SESSION
SOUP_IS_SESSION_CLASS
@@ -572,9 +576,6 @@ soup_socket_read
soup_socket_read_until
soup_socket_write
<SUBSECTION>
-SOUP_SSL_ERROR
-SoupSSLError
-<SUBSECTION>
SOUP_SOCKET_LOCAL_ADDRESS
SOUP_SOCKET_REMOTE_ADDRESS
SOUP_SOCKET_FLAG_NONBLOCKING
@@ -587,6 +588,7 @@ SOUP_SOCKET_SSL_STRICT
SOUP_SOCKET_TLS_CERTIFICATE
SOUP_SOCKET_TLS_ERRORS
SOUP_SOCKET_TRUSTED_CERTIFICATE
+SOUP_SOCKET_USE_THREAD_CONTEXT
<SUBSECTION Standard>
SOUP_SOCKET
SOUP_IS_SOCKET
@@ -597,10 +599,11 @@ SOUP_IS_SOCKET_CLASS
SOUP_SOCKET_GET_CLASS
SoupSocketClass
<SUBSECTION Private>
-soup_ssl_error_quark
soup_socket_get_fd
soup_socket_handshake_async
soup_socket_handshake_sync
+soup_socket_get_gsocket
+soup_socket_get_iostream
</SECTION>
<SECTION>
@@ -628,6 +631,7 @@ SOUP_URI_SCHEME_DATA
SOUP_URI_SCHEME_FILE
SOUP_URI_SCHEME_FTP
soup_uri_uses_default_port
+SOUP_URI_IS_VALID
SOUP_URI_VALID_FOR_HTTP
<SUBSECTION>
soup_uri_set_scheme
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 2797fdad..a4f32898 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -560,7 +560,7 @@ soup_session_class_init (SoupSessionClass *session_class)
FALSE,
G_PARAM_READWRITE));
/**
- * #SoupSession:ssl-ca-file:
+ * SoupSession:ssl-ca-file:
*
* File containing SSL CA certificates.
*
@@ -592,7 +592,7 @@ soup_session_class_init (SoupSessionClass *session_class)
* Since: 2.38
**/
/**
- * #SoupSession:ssl-use-system-ca-file:
+ * SoupSession:ssl-use-system-ca-file:
*
* Setting this to %TRUE overrides #SoupSession:ssl-ca-file
* and #SoupSession:tls-database, and uses the default system
@@ -619,7 +619,7 @@ soup_session_class_init (SoupSessionClass *session_class)
* Since: 2.38
**/
/**
- * #SoupSession:tls-database:
+ * SoupSession:tls-database:
*
* Overrides #SoupSession:ssl-ca-file and
* #SoupSession:ssl-use-system-ca-file, and uses the provided