Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:11.4:Update
evolution-data-server.import4159
fix-for-nntp-over-command.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-for-nntp-over-command.patch of Package evolution-data-server.import4159
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index 943368d..a92e60e 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -129,6 +129,37 @@ nntp_can_work_offline(CamelDiscoStore *store) return TRUE; } +static gint +check_capabilities (CamelNNTPStore *store, GError **error) +{ + gint ret; + gchar *line; + guint len; + + store->capabilities = 0; + + ret = camel_nntp_raw_command_auth (store, error, &line, "CAPABILITIES"); + if (ret != 101) + return -1; + + while ((ret = camel_nntp_stream_line (store->stream, (guchar **) &line, &len, error)) > 0) { + while (len > 0 && g_ascii_isspace (*line)) { + line++; + len--; + } + + if (len == 4 && g_ascii_strncasecmp (line, "OVER", len) == 0) + store->capabilities |= NNTP_CAPABILITY_OVER; + + if (len == 1 && g_ascii_strncasecmp (line, ".", len) == 0) { + ret = 0; + break; + } + } + + return ret; +} + static struct { const gchar *name; gint type; @@ -330,10 +361,12 @@ static struct { static gboolean nntp_connect_online (CamelService *service, GError **error) { + CamelNNTPStore *store = CAMEL_NNTP_STORE (service); const gchar *ssl_mode; gint mode, i; gchar *serv; gint fallback_port; + GError *local_error = NULL; if ((ssl_mode = camel_url_get_param (service->url, "use_ssl"))) { for (i = 0; ssl_options[i].value; i++) @@ -354,6 +387,30 @@ nntp_connect_online (CamelService *service, GError **error) fallback_port = 0; } + if (!connect_to_server ( + service, service->url->host, serv, + fallback_port, mode, error)) + return FALSE; + + if (check_capabilities (store, &local_error) != -1) + return TRUE; + + if (local_error) + g_error_free (local_error); + + store->capabilities = 0; + + /* disconnect and reconnect without capability check */ + camel_service_lock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK); + + if (store->stream) + g_object_unref (store->stream); + store->stream = NULL; + g_free (store->current_folder); + store->current_folder = NULL; + + camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK); + return connect_to_server (service, service->url->host, serv, fallback_port, mode, error); } diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h index 3f0de8d..bbfa6de 100644 --- a/camel/providers/nntp/camel-nntp-store.h +++ b/camel/providers/nntp/camel-nntp-store.h @@ -78,6 +78,11 @@ struct _xover_header { xover_t type:8; }; +/* names of supported capabilities on the server */ +enum nntp_capabilities { + NNTP_CAPABILITY_OVER = (1 << 0) /* supports OVER command */ +}; + struct _CamelNNTPStore { CamelDiscoStore parent; @@ -100,6 +105,7 @@ struct _CamelNNTPStore { gchar *current_folder, *storage_path, *base_url; struct _xover_header *xover; + guint32 capabilities; /* bit-or of nntp_capabilities */ }; struct _CamelNNTPStoreClass { diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c index 815a42e..f0dfab1 100644 --- a/camel/providers/nntp/camel-nntp-summary.c +++ b/camel/providers/nntp/camel-nntp-summary.c @@ -237,10 +237,15 @@ add_range_xover (CamelNNTPSummary *cns, CamelNNTPStore *store, guint high, guint camel_operation_start (NULL, _("%s: Scanning new messages"), ((CamelService *)store)->url->host); - ret = camel_nntp_raw_command_auth (store, error, &line, "over %r", low, high); - if (ret != 224) + if ((store->capabilities & NNTP_CAPABILITY_OVER) != 0) + ret = camel_nntp_raw_command_auth (store, error, &line, "over %r", low, high); + else + ret = -1; + if (ret != 224) { + store->capabilities = store->capabilities & (~NNTP_CAPABILITY_OVER); ret = camel_nntp_raw_command_auth (store, error, &line, "xover %r", low, high); - + } + if (ret != 224) { camel_operation_end (NULL); if (ret != -1)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor