diff options
| author | Joe Orton <notroj@users.noreply.github.com> | 2009-12-30 21:34:07 +0000 |
|---|---|---|
| committer | Joe Orton <notroj@users.noreply.github.com> | 2009-12-30 21:34:07 +0000 |
| commit | f7a75ba05160eb2d4ebb212988ef261300d67919 (patch) | |
| tree | 1381685cf5c43629941d04210e2931ca437ba5d2 | |
| parent | 126047a53b7a469d7cea3e633db08448281e9ee1 (diff) | |
| download | neon-git-0.29.2.tar.gz | |
Tag release 0.29.2.0.29.2
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | macros/neon.m4 | 19 | ||||
| -rw-r--r-- | po/cs.po | 185 | ||||
| -rw-r--r-- | po/de.po | 182 | ||||
| -rw-r--r-- | po/fr.po | 182 | ||||
| -rw-r--r-- | po/ja.po | 182 | ||||
| -rw-r--r-- | po/neon.pot | 180 | ||||
| -rw-r--r-- | po/nn.po | 184 | ||||
| -rw-r--r-- | po/pl.po | 96 | ||||
| -rw-r--r-- | po/ru.po | 180 | ||||
| -rw-r--r-- | po/tr.po | 182 | ||||
| -rw-r--r-- | po/zh_CN.po | 184 | ||||
| -rw-r--r-- | src/ne_utils.c | 8 | ||||
| -rw-r--r-- | src/ne_utils.h | 1 | ||||
| -rw-r--r-- | src/neon.vers | 1 | ||||
| -rw-r--r-- | test/auth.c | 51 | ||||
| -rw-r--r-- | test/common/child.c | 59 | ||||
| -rw-r--r-- | test/common/child.h | 8 | ||||
| -rw-r--r-- | test/props.c | 13 | ||||
| -rw-r--r-- | test/redirect.c | 27 | ||||
| -rw-r--r-- | test/session.c | 8 | ||||
| -rw-r--r-- | test/socket.c | 33 | ||||
| -rw-r--r-- | test/ssl.c | 5 | ||||
| -rw-r--r-- | test/stubs.c | 2 | ||||
| -rw-r--r-- | test/utils.c | 38 | ||||
| -rw-r--r-- | test/utils.h | 16 |
26 files changed, 1102 insertions, 929 deletions
@@ -1,8 +1,11 @@ +Changes in release 0.29.2: +* Fix spurious 'certificate verify failed' errors with OpenSSL (Tom C) +* Fix unnecessary re-authentication with SSPI (Danil Shopyrin) + Changes in release 0.29.1: * Fixes for (Unix) NTLM implementation: - fix handling of session timeout (Kai Sommerfeld) - fix possible crash (basic@mozdev.org) -* Fix unnecessary re-authentication with SSPI (Danil Shopyrin) * Build fixes for Win32: - fix use of socklen_t with recent SDKs (Stefan Kung) - fix USE_GETADDRINFO on Win2K (Kai Sommerfeld) diff --git a/macros/neon.m4 b/macros/neon.m4 index a93a383..f33342a 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -136,18 +136,12 @@ AC_DEFUN([NE_VERSIONS_BUNDLED], [ # Define the current versions. NE_VERSION_MAJOR=0 -NE_VERSION_MINOR=30 -NE_VERSION_PATCH=0 -NE_VERSION_TAG=-dev - -# libtool library interface versioning. Release policy dictates that -# for neon 0.x.y, each x brings an incompatible interface change, and -# each y brings no interface change, and since this policy has been -# followed since 0.1, x == CURRENT, y == RELEASE, 0 == AGE. For -# 1.x.y, this will become N + x == CURRENT, y == RELEASE, x == AGE, -# where N is constant (and equal to CURRENT + 1 from the final 0.x -# release) -NE_LIBTOOL_VERSINFO="${NE_VERSION_MINOR}:${NE_VERSION_PATCH}:0" +NE_VERSION_MINOR=29 +NE_VERSION_PATCH=2 +NE_VERSION_TAG= + +# 0.29.x is backwards-compatible to 0.27.x, so AGE=2 +NE_LIBTOOL_VERSINFO="29:${NE_VERSION_PATCH}:2" NE_DEFINE_VERSIONS @@ -516,7 +510,6 @@ fi if test "$NE_FLAG_LFS" = "yes"; then AC_DEFINE_UNQUOTED([NE_FMT_NE_OFF_T], [NE_FMT_OFF64_T], [Define to be printf format string for ne_off_t]) - NE_ADD_ABITAG(LFS) else AC_DEFINE_UNQUOTED([NE_FMT_NE_OFF_T], [NE_FMT_OFF_T]) fi @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.11.4\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2002-04-09 11:12+0100\n" "Last-Translator: Petr Prazak <prazak@grisoft.cz>\n" "Language-Team: cz\n" @@ -24,110 +24,110 @@ msgstr "" "Stavov dka byla: %s" # src/console_fe.c:961 -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "Nelze se pipojit k serveru" # src/console_fe.c:961 -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "Nelze se pipojit k proxy serveru" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 #, fuzzy msgid "GSSAPI authentication error: " msgstr "Je vyadovna autentizace na %s `%s':\n" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "Nelze zpracovat velikost bloku" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "Nelze zpracovat velikost bloku" @@ -179,23 +179,43 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +# src/console_fe.c:992 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "Nelze zapsat do souboru: %s" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" # src/console_fe.c:992 -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "Nelze zapsat do souboru: %s" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -214,17 +234,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -268,120 +283,138 @@ msgstr "Nelze zapsat do souboru: %s" msgid "Could not send request body" msgstr "Nelze odeslat tlo poadavku" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "Nelze nast velikost bloku" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "Nelze zpracovat velikost bloku" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "Nelze nast tlo odpovdi" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "Nelze nast velikost bloku" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "Nelze pest stavov dek" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "Nelze zpracovat stavov dek odpovdi." -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "Nelze nast tlo odpovdi" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "Nelze poslat poadavek" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "Chyba pi ten hlaviek odpovdi" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "Hlavika odpovdi je pli dlouh" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 #, fuzzy msgid "Response exceeded maximum number of header fields" msgstr "Odpov pekrocila maximln poet poloek v hlavicce." # src/console_fe.c:956 -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: Chyba: Nelze najt adresu vzdlenho potae (%s).\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" # src/console_fe.c:992 -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "Nelze zapsat do souboru: %s" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "Nelze navzat SSL spojen pes proxy server." -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "Nelze navzat SSL spojen" # src/console_fe.c:961 -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "Nelze se pipojit k serveru" + +# src/console_fe.c:961 +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "Nelze se pipojit k proxy serveru" -# src/console_fe.c:961 -#: src/ne_request.c:1531 -msgid "Could not connect to server" -msgstr "Nelze se pipojit k serveru" +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" + +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "Nelze navzat SSL spojen pes proxy server." -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -414,40 +447,40 @@ msgstr "%s: Chyba: %s\n" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "dek je pli dlouh" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "Pota nenalezen" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 #, fuzzy msgid "Connection timed out" msgstr "%s: spojen vyprelo." -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "Nelze navzat SSL spojen" @@ -592,17 +625,17 @@ msgid "XML parse error at line %d: invalid element name" msgstr "Chyba zpracovn XML na dku %d: %s." # src/common.c:87 -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "Neznm systmov chyba" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" # src/console_fe.c:821 -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "Chyba zpracovn XML na dku %d: %s." @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.11.3\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2002-01-13 13:37+0100\n" "Last-Translator: Thomas Schultz <tststs@gmx.de>\n" "Language-Team: de\n" @@ -22,109 +22,109 @@ msgstr "" "Ungltige HTTP Status-Zeile im Status-Element in Zeile %d der Antwort:\n" "Status-Zeile war: %s" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "Verbindungsaufbau zum Server gescheitert." -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "Verbindungsaufbau zum Proxy-Server gescheitert." -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 #, fuzzy msgid "GSSAPI authentication error: " msgstr "Anmeldung wird bentigt auf %s `%s':\n" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "Parser-Fehler bei Ermittlung der Blockgre" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "Parser-Fehler bei Ermittlung der Blockgre" @@ -173,22 +173,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "Konnte nicht in diese Datei schreiben: %s" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "Konnte nicht in diese Datei schreiben: %s" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -207,17 +226,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -260,116 +274,134 @@ msgstr "Konnte nicht in diese Datei schreiben: %s" msgid "Could not send request body" msgstr "Konnte den Rumpf der Anfrage nicht schicken" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "Lesefehler bei Ermittlung der Blockgre" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "Parser-Fehler bei Ermittlung der Blockgre" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "Konnte Rumpf der Antwort nicht lesen" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "Lesefehler bei Ermittlung der Blockgre" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "Konnte Status-Zeile des Servers nicht lesen" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "Konnte Status-Zeile des Servers nicht interpretieren." -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "Konnte Rumpf der Antwort nicht lesen" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "Konnte keine Anfrage (request) schicken" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "Fehler beim Lesen der Kopfzeilen (header) der Antwort" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "Kopfzeilen (header) der Antwort zu lang" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 #, fuzzy msgid "Response exceeded maximum number of header fields" msgstr "Antwort hatte zu viele Header-Felder." -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: Fehler: Konnte den Namen des Servers nicht auflsen (%s).\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "Konnte nicht in diese Datei schreiben: %s" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "Konnte durch den Proxy-Server keine SSL-Verbindung herstellen" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "Konnte keine SSL-Sitzung herstellen" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "Verbindungsaufbau zum Server gescheitert." + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "Verbindungsaufbau zum Proxy-Server gescheitert." -#: src/ne_request.c:1531 -msgid "Could not connect to server" -msgstr "Verbindungsaufbau zum Server gescheitert." +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" + +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "Konnte durch den Proxy-Server keine SSL-Verbindung herstellen" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -402,40 +434,40 @@ msgstr "%s: Fehler: %s\n" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "Zeile zu lang" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "Host nicht gefunden" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 #, fuzzy msgid "Connection timed out" msgstr "%s: Verbindung wegen Zeitberschreitung geschlossen." -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "Konnte keine SSL-Sitzung herstellen" @@ -575,16 +607,16 @@ msgstr "Konnte Rumpf der Antwort nicht lesen" msgid "XML parse error at line %d: invalid element name" msgstr "Fehler beim XML-Parsing in Zeile %d: %s." -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "Unbekannter System-Fehler" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "Fehler beim XML-Parsing in Zeile %d: %s." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.9.3\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2000-01-31 00:00+0100\n" "Last-Translator: Sylvain Glaize <mokona@puupuu.org>\n" "Language-Team: fr\n" @@ -21,108 +21,108 @@ msgid "" "Status line was: %s" msgstr "" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 msgid "GSSAPI authentication error: " msgstr "" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" @@ -171,22 +171,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -205,17 +224,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -257,118 +271,136 @@ msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" msgid "Could not send request body" msgstr "" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "" -#: src/ne_request.c:710 +#: src/ne_request.c:714 #, fuzzy msgid "Could not parse chunk size" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: erreur: impossible de trouver le nom de l'hte distant.\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, fuzzy, c-format msgid "Could not write to file: %s" msgstr "%s: erreur: impossible d'ouvrir le fichier de ressources: %s\n" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 #, fuzzy -msgid "Could not connect to proxy server" +msgid "Could not connect to server" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_request.c:1531 +#: src/ne_request.c:1498 #, fuzzy -msgid "Could not connect to server" +msgid "Could not connect to proxy server" +msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" + +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" + +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -403,39 +435,39 @@ msgstr "" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 msgid "Connection timed out" msgstr "" -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "%s: erreur: impossible de se connecter l'hte distant.\n" @@ -576,16 +608,16 @@ msgstr "" "%s: erreur dans le fichier de ressources la ligne %d:\n" "%s\n" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "Erreur systme inconnue" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.10.14\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2001-01-16 07:32+0900\n" "Last-Translator: Nobuyuki Tsuchimura <tutimura@nn.iij4u.or.jp>\n" "Language-Team: ja\n" @@ -21,109 +21,109 @@ msgid "" "Status line was: %s" msgstr "" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "ץС³Ǥޤ" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "ץС³Ǥޤ" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 #, fuzzy msgid "GSSAPI authentication error: " msgstr "%s ؤǧڤ %s ɬפǤ '%s':\n" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "chunk 礭ϤǤޤ" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "chunk 礭ϤǤޤ" @@ -172,22 +172,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "ե뤬ޤ: %s" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "ե뤬ޤ: %s" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -206,17 +225,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -258,115 +272,133 @@ msgstr "ե뤬ޤ: %s" msgid "Could not send request body" msgstr "" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "chunk 礭ɤޤ" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "chunk 礭ϤǤޤ" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "response body ɤޤ" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "chunk 礭ɤޤ" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "response body ɤޤ" -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "response body ɤޤ" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: 顼: СΥۥ̾ (%s) IP ɥ쥹ѴǤޤ\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "ե뤬ޤ: %s" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "ץС SSL ³Ǥޤ" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "ץС SSL ³Ǥޤ" -#: src/ne_request.c:1530 -msgid "Could not connect to proxy server" +#: src/ne_request.c:1496 +msgid "Could not connect to server" msgstr "ץС³Ǥޤ" -#: src/ne_request.c:1531 -msgid "Could not connect to server" +#: src/ne_request.c:1498 +msgid "Could not connect to proxy server" msgstr "ץС³Ǥޤ" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" + +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "ץС SSL ³Ǥޤ" + +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -399,40 +431,40 @@ msgstr "" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 #, fuzzy msgid "Connection timed out" msgstr "%s: ³ॢȤǤ" -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "ץС SSL ³Ǥޤ" @@ -574,16 +606,16 @@ msgstr "" "%s: rcfile %d ԤǴְäƤޤ:\n" "%s\n" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "̤ΤΥƥ२顼" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "" diff --git a/po/neon.pot b/po/neon.pot index a0adc3a..4d5f266 100644 --- a/po/neon.pot +++ b/po/neon.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,107 +23,107 @@ msgid "" "Status line was: %s" msgstr "" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, c-format msgid "Could not authenticate to server: %s" msgstr "" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, c-format msgid "Could not authenticate to proxy server: %s" msgstr "" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 msgid "GSSAPI authentication error: " msgstr "" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 msgid "could not parse domain in Digest challenge" msgstr "" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 msgid "could not parse challenge" msgstr "" @@ -169,22 +169,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, c-format +msgid "Could not verify server certificate: %s" +msgstr "" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, c-format msgid "SSL handshake failed: %s" msgstr "" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -203,17 +222,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -255,112 +269,130 @@ msgstr "" msgid "Could not send request body" msgstr "" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "" -#: src/ne_request.c:763 +#: src/ne_request.c:767 msgid "Could not read chunk delimiter" msgstr "" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "" -#: src/ne_request.c:894 +#: src/ne_request.c:897 msgid "Could not parse response status line" msgstr "" -#: src/ne_request.c:906 +#: src/ne_request.c:909 msgid "Could not read interim response headers" msgstr "" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, c-format msgid "Could not resolve hostname `%s': %s" msgstr "" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, c-format msgid "Could not create socket" msgstr "" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "" + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "" -#: src/ne_request.c:1531 -msgid "Could not connect to server" +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" msgstr "" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_request.c:1599 +#, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "" + +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -391,39 +423,39 @@ msgstr "" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 msgid "Connection timed out" msgstr "" -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 msgid "Could not create SSL structure" msgstr "" @@ -550,15 +582,15 @@ msgstr "" msgid "XML parse error at line %d: invalid element name" msgstr "" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 msgid "Unknown error" msgstr "" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, c-format msgid "XML parse error at line %d: %s" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.11.4\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2002-11-07 18:11+0100\n" "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -23,109 +23,109 @@ msgstr "" "Ugyldig HTTP-statuslinje i statuselement på linje %d av svaret:\n" "Statuslinja var: %s" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "Klarte ikkje kopla til tenaren." -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "Klarte ikkje kopla til mellomtenar" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 #, fuzzy msgid "GSSAPI authentication error: " msgstr "Krev autentisering på %s «%s»:\n" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, fuzzy, c-format msgid "Negotiate response verification failure: %s" msgstr "Tenarsertifikatet er utgått på dato." -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "Klarte ikkje tolka storleik på oppdelt svar" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "Klarte ikkje tolka storleik på oppdelt svar" @@ -174,22 +174,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "Klarte ikkje skriva til fil: %s" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "Klarte ikkje skriva til fil: %s" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -208,17 +227,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, fuzzy, c-format msgid "Server certificate changed: connection intercepted?" msgstr "Tenarsertifikatet er utgått på dato." @@ -261,120 +275,140 @@ msgstr "Klarte ikkje skriva til fil: %s" msgid "Could not send request body" msgstr "Klarte ikkje senda førespurnad" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "Klarte ikkje lesa storleik på oppdelt svar" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "Klarte ikkje tolka storleik på oppdelt svar" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "Klarte ikkje lesa svar" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "Klarte ikkje lesa storleik på oppdelt svar" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "Klarte ikkje lesa statuslinja" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "Klarte ikkje tolka statuslinja i svaret." -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "Klarte ikkje lesa svarlinje" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "Klarte ikkje senda førespurnad" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "Feil ved lesing av svarhovud" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "For langt svarhovud" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 #, fuzzy msgid "Response exceeded maximum number of header fields" msgstr "Svaret inneheld for mange header-felt." -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: Feil: Fann ikkje adressa til nettverksvert (%s).\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "Klarte ikkje skriva til fil: %s" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "Klarte ikkje oppretta SSL-tilkopling til mellomtenar" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "Klarte ikkje forhandla SSL-økt" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "Klarte ikkje kopla til tenaren." + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "Klarte ikkje kopla til mellomtenar" -#: src/ne_request.c:1531 -msgid "Could not connect to server" -msgstr "Klarte ikkje kopla til tenaren." +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "Klarte ikkje oppretta SSL-tilkopling til mellomtenar" + +#: src/ne_session.c:528 src/ne_session.c:539 #, fuzzy msgid "[invalid date]" msgstr "[ugyldig dato]" -#: src/ne_session.c:385 +#: src/ne_session.c:552 #, fuzzy msgid "certificate is not yet valid" msgstr "Sertifikatet er gyldig" -#: src/ne_session.c:386 +#: src/ne_session.c:553 #, fuzzy msgid "certificate has expired" msgstr "Tenarsertifikatet er utgått på dato." -#: src/ne_session.c:387 +#: src/ne_session.c:554 #, fuzzy msgid "certificate issued for a different hostname" msgstr "Sertifikatet er utferda av:" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +#, fuzzy +msgid "bad certificate chain" +msgstr "Tenarsertifikatet er utgått på dato." + +#: src/ne_session.c:557 +#, fuzzy +msgid "certificate has been revoked" +msgstr "Tenarsertifikatet er utgått på dato." + +#: src/ne_session.c:562 #, fuzzy msgid "Server certificate verification failed: " msgstr "Tenarsertifikatet er utgått på dato." @@ -408,43 +442,43 @@ msgstr "%s: Feil: %s\n" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "For lang linje" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "Fann ikkje vert" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 #, fuzzy msgid "Connection timed out" msgstr "%s: sambandet vart tidsavbrote." -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 #, fuzzy msgid "Client certificate verification failed" msgstr "Tenarsertifikatet er utgått på dato." -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 #, fuzzy msgid "SSL disabled due to lack of entropy" msgstr "SSL avslått grunna mangel på entropi" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 #, fuzzy msgid "SSL disabled due to library version mismatch" msgstr "SSL avslått grunna mangel på entropi" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "Klarte ikkje forhandla SSL-økt" @@ -584,16 +618,16 @@ msgstr "Klarte ikkje lesa svar" msgid "XML parse error at line %d: invalid element name" msgstr "XML-tolkingsfeil på linje %d: %s." -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "Ukjend systemfeil" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "XML-tolkingsfeil på linje %d: %s." @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Neon 0.30.0\n" +"Project-Id-Version: Neon 0.29.0\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2009-09-04 02:00+0200\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2009-09-04 02:00+0200\n" "Last-Translator: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail." "com>\n" @@ -74,68 +74,68 @@ msgstr "" msgid "Negotiate response verification failure: %s" msgstr "porażka weryfikacji odpowiedzi Negotiate: %s" -#: src/ne_auth.c:762 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "nieznany algorytm w wezwaniu Digest" -#: src/ne_auth.c:766 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "niekompatybilny algorytm w wezwaniu Digest" -#: src/ne_auth.c:770 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "brakujący parametr w wezwaniu Digest" -#: src/ne_auth.c:774 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "początkowe wezwanie Digest było nieaktualne" -#: src/ne_auth.c:781 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "nieaktualne wezwanie Digest z nowym algorytmem lub domeną" -#: src/ne_auth.c:793 +#: src/ne_auth.c:796 msgid "could not parse domain in Digest challenge" msgstr "nie można parsować domeny w wezwaniu Digest" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "Porażka wzajemnego uwierzytelniania Digest: brakujące parametry" -#: src/ne_auth.c:1107 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" "Porażka wzajemnego uwierzytelniania Digest: niezgodność posłańca klienta" -#: src/ne_auth.c:1117 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" "Porażka wzajemnego uwierzytelniania Digest: nie można parsować licznika " "posłańca" -#: src/ne_auth.c:1122 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" "Porażka wzajemnego uwierzytelniania Digest: niezgodność licznika posłańca (%" "u nie %u)" -#: src/ne_auth.c:1165 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" "Porażka wzajemnego uwierzytelniania Digest: niezgodność request-digest " "mismatch" -#: src/ne_auth.c:1296 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "wezwanie %s zignorowane" -#: src/ne_auth.c:1375 +#: src/ne_auth.c:1378 msgid "could not parse challenge" msgstr "nie można parsować wezwania" @@ -181,41 +181,41 @@ msgstr "[niedrukowalne:#%lu]" msgid "[unprintable]" msgstr "[niedrukowalne]" -#: src/ne_gnutls.c:815 +#: src/ne_gnutls.c:817 msgid "signed using insecure algorithm" msgstr "podpisane przy użyciu niebezpiecznego algorytmu" -#: src/ne_gnutls.c:818 +#: src/ne_gnutls.c:820 #, c-format msgid "unrecognized errors (%u)" msgstr "nierozpoznane błędy (%u)" -#: src/ne_gnutls.c:863 src/ne_openssl.c:466 +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "Certyfikat serwera nie posiada atrybutu commonName w nazwie tematu" -#: src/ne_gnutls.c:877 +#: src/ne_gnutls.c:879 #, c-format msgid "Could not verify server certificate: %s" msgstr "Nie można zweryfikować certyfikatu serwera: %s" -#: src/ne_gnutls.c:889 src/ne_openssl.c:453 +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 #, c-format msgid "Certificate verification error: %s" msgstr "Błąd weryfikacji certyfikatu: %s" -#: src/ne_gnutls.c:922 src/ne_openssl.c:659 +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "Uzgodnienie SSL nie udało się, certyfikat klienta został zażądany: %s" -#: src/ne_gnutls.c:927 src/ne_openssl.c:664 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, c-format msgid "SSL handshake failed: %s" msgstr "Uzgodnienie SSL nie udało się: %s" -#: src/ne_gnutls.c:937 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "Serwer nie wysłał łańcucha certyfikatu" @@ -235,12 +235,12 @@ msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" "Nie zwrócono żadnej aktywnej blokady dla <%s> w odpowiedzi LOCK refresh" -#: src/ne_openssl.c:684 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "Serwer SSL nie przedstawił certyfikatu" -#: src/ne_openssl.c:693 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "Certyfikat serwera zmienił się: połączenie przechwycone?" @@ -377,98 +377,98 @@ msgstr "Nie można znaleźć adresu IPv4 nazwy hosta %s dla proxy SOCKS v4" msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" msgstr "Nie można nawiązać połączenia z proxy SOCKS (%s:%u): %s" -#: src/ne_session.c:513 src/ne_session.c:524 +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "[nieprawidłowa data]" -#: src/ne_session.c:537 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "certyfikat nie jest jeszcze poprawny" -#: src/ne_session.c:538 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "certyfikat wygasł" -#: src/ne_session.c:539 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "certyfikat wydany dla innej nazwy hosta" -#: src/ne_session.c:540 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "wydawca nie jest zaufany" -#: src/ne_session.c:541 +#: src/ne_session.c:556 msgid "bad certificate chain" msgstr "zły łańcuch certyfikatu" -#: src/ne_session.c:542 +#: src/ne_session.c:557 msgid "certificate has been revoked" msgstr "certyfikat został unieważniony" -#: src/ne_session.c:547 +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "Weryfikacja certyfikatu serwera nie powiodła się: " -#: src/ne_socket.c:515 src/ne_socket.c:611 src/ne_socket.c:715 +#: src/ne_socket.c:516 src/ne_socket.c:612 src/ne_socket.c:716 msgid "Connection closed" msgstr "Połączenie zamknięte" -#: src/ne_socket.c:621 src/ne_socket.c:727 +#: src/ne_socket.c:622 src/ne_socket.c:728 msgid "Secure connection truncated" msgstr "Bezpieczne połączenie obcięte" -#: src/ne_socket.c:633 src/ne_socket.c:739 +#: src/ne_socket.c:634 src/ne_socket.c:740 #, c-format msgid "SSL error: %s" msgstr "Błąd SSL: %s" -#: src/ne_socket.c:636 +#: src/ne_socket.c:637 #, c-format msgid "SSL error code %d/%d/%lu" msgstr "Kod błędu SSL %d/%d/%lu" -#: src/ne_socket.c:720 +#: src/ne_socket.c:721 #, c-format msgid "SSL alert received: %s" msgstr "Alarm SSL otrzymany: %s" -#: src/ne_socket.c:735 +#: src/ne_socket.c:736 msgid "SSL socket read failed" msgstr "Odczytywanie gniazda SSL nie powiodło się" -#: src/ne_socket.c:866 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "Linia zbyt długa" -#: src/ne_socket.c:1011 src/ne_socket.c:1017 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "Host nieznaleziony" -#: src/ne_socket.c:1187 +#: src/ne_socket.c:1221 msgid "Connection timed out" msgstr "Czas połączenia się skończył" -#: src/ne_socket.c:1378 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "Numer deskryptoru gniazda przekracza FD_SETSIZE" -#: src/ne_socket.c:1440 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "Rodzina gniazda niewspierana" -#: src/ne_socket.c:1663 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "Weryfikacja certyfikatu klienta nie powiodła się" -#: src/ne_socket.c:1679 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "SSL wyłączone z powodu braku entropii" -#: src/ne_socket.c:1686 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "SSL wyłączone z powodu niezgodności wersji biblioteki" -#: src/ne_socket.c:1692 +#: src/ne_socket.c:1730 msgid "Could not create SSL structure" msgstr "Nie można utworzyć struktury SSL" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy 0.11.5\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2002-11-11 14:28+0000\n" "Last-Translator: Michael Sobolev <neon@webdav.org>\n" "Language-Team: ru\n" @@ -21,108 +21,108 @@ msgid "" "Status line was: %s" msgstr "" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "%s: : : %s\n" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "%s: : : %s\n" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 msgid "GSSAPI authentication error: " msgstr "" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "%s: : : %s\n" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "%s: : : %s\n" @@ -171,22 +171,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "%s: : : %s\n" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "%s: : : %s\n" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -205,17 +224,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -257,116 +271,134 @@ msgstr "%s: : : %s\n" msgid "Could not send request body" msgstr "" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "" -#: src/ne_request.c:710 +#: src/ne_request.c:714 #, fuzzy msgid "Could not parse chunk size" msgstr "%s: : : %s\n" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "%s: : : %s\n" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "%s: : : %s\n" -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "%s: : : %s\n" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: : : %s.\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, fuzzy, c-format msgid "Could not write to file: %s" msgstr "%s: : : %s\n" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "%s: : : %s\n" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "" + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "" -#: src/ne_request.c:1531 -msgid "Could not connect to server" +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" msgstr "" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_request.c:1599 +#, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "" + +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -397,39 +429,39 @@ msgstr "" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 msgid "Connection timed out" msgstr "" -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 msgid "Could not create SSL structure" msgstr "" @@ -565,16 +597,16 @@ msgstr "%s: : : %s\n" msgid "XML parse error at line %d: invalid element name" msgstr "" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr " " -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, c-format msgid "XML parse error at line %d: %s" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sitecopy-0.10.10\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2001-01-03 HO:MI+ZONE\n" "Last-Translator: A. Sinan Unur <sinan@unur.com>\n" "Language-Team: tr\n" @@ -24,108 +24,108 @@ msgstr "" "Invalid HTTP status line in status element at line %d of response:\n" "Status line was: %s" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, fuzzy, c-format msgid "Could not authenticate to server: %s" msgstr "Sunucuyla balant kurulamad" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, fuzzy, c-format msgid "Could not authenticate to proxy server: %s" msgstr "Ara sunucuyla balant kurulamad" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 msgid "GSSAPI authentication error: " msgstr "" -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 #, fuzzy msgid "could not parse domain in Digest challenge" msgstr "Para boyutu anlalamad" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 #, fuzzy msgid "could not parse challenge" msgstr "Para boyutu anlalamad" @@ -174,22 +174,41 @@ msgstr "" msgid "[unprintable]" msgstr "" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "%s dosyasna yazm yaplamad" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "%s dosyasna yazm yaplamad" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "" @@ -208,17 +227,12 @@ msgstr "" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "" @@ -260,115 +274,133 @@ msgstr "%s dosyasna yazm yaplamad" msgid "Could not send request body" msgstr "stek metni gnderilemedi" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "Para boyutu renilemedi" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "Para boyutu anlalamad" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "Yant metni okunamad" -#: src/ne_request.c:763 +#: src/ne_request.c:767 #, fuzzy msgid "Could not read chunk delimiter" msgstr "Para boyutu renilemedi" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "Durum satr okunamad" -#: src/ne_request.c:894 +#: src/ne_request.c:897 #, fuzzy msgid "Could not parse response status line" msgstr "Durum satr anlalamad." -#: src/ne_request.c:906 +#: src/ne_request.c:909 #, fuzzy msgid "Could not read interim response headers" msgstr "Yant metni okunamad" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "stek gnderilemedi" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "Yant balklar okunurken hata" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "Yant bal ok uzun" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, fuzzy, c-format msgid "Could not resolve hostname `%s': %s" msgstr "%s: Hata: %s sunucusunun adresi bulunamad.\n" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "%s dosyasna yazm yaplamad" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, fuzzy, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "Ara sunucu zerinden SSL balants kurulamad" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, fuzzy, c-format msgid "Could not create socket" msgstr "SSL balants kurulamad" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "Sunucuyla balant kurulamad" + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "Ara sunucuyla balant kurulamad" -#: src/ne_request.c:1531 -msgid "Could not connect to server" -msgstr "Sunucuyla balant kurulamad" +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" + +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "Ara sunucu zerinden SSL balants kurulamad" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +msgid "bad certificate chain" +msgstr "" + +#: src/ne_session.c:557 +msgid "certificate has been revoked" +msgstr "" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "" @@ -401,40 +433,40 @@ msgstr "%s: Hata: %s\n" msgid "SSL socket read failed" msgstr "" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "Satr ok uzun" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "Sunucu bulunamad" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 #, fuzzy msgid "Connection timed out" msgstr "%s: balant bekleme snr ald." -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 #, fuzzy msgid "Could not create SSL structure" msgstr "SSL balants kurulamad" @@ -576,16 +608,16 @@ msgstr "" "%s: kurulum dosyasnda bozukluk var. satr %d:\n" "%s\n" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 #, fuzzy msgid "Unknown error" msgstr "Bilinmeyen sistem hatas" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, fuzzy, c-format msgid "XML parse error at line %d: %s" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index e3b028d..580395f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: neon 0.29.x\n" "Report-Msgid-Bugs-To: neon@lists.manyfish.co.uk\n" -"POT-Creation-Date: 2008-08-22 12:42+0100\n" +"POT-Creation-Date: 2009-12-30 21:31+0000\n" "PO-Revision-Date: 2008-03-03 11:20+0800\n" "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" "Language-Team: neon@webdav.org\n" @@ -26,107 +26,107 @@ msgstr "" "响应信息中 %d 行的状态元素中发现非法 HTTP 状态行：\n" "状态行是: %s" -#: src/ne_auth.c:130 +#: src/ne_auth.c:134 #, c-format msgid "Could not authenticate to server: %s" msgstr "不能认证到服务器: %s" -#: src/ne_auth.c:135 +#: src/ne_auth.c:139 #, c-format msgid "Could not authenticate to proxy server: %s" msgstr "不能认证到代理服务器: %s" -#: src/ne_auth.c:358 +#: src/ne_auth.c:374 #, c-format msgid "rejected %s challenge" msgstr "被拒绝的 %s 挑战" -#: src/ne_auth.c:374 +#: src/ne_auth.c:390 msgid "missing realm in Basic challenge" msgstr "在基本挑战中丢失了领域" -#: src/ne_auth.c:469 +#: src/ne_auth.c:485 msgid "invalid Negotiate token" msgstr "非法磋商令牌" -#: src/ne_auth.c:492 +#: src/ne_auth.c:508 msgid "GSSAPI authentication error: " msgstr "GSSAPI 认证错误: " -#: src/ne_auth.c:505 +#: src/ne_auth.c:521 #, c-format msgid "GSSAPI failure (code %u)" msgstr "GSSAPI 失败(代码 %u)" -#: src/ne_auth.c:540 +#: src/ne_auth.c:556 msgid "ignoring empty Negotiate continuation" msgstr "忽略后续的空磋商" -#: src/ne_auth.c:555 +#: src/ne_auth.c:571 #, c-format msgid "Negotiate response verification failed: invalid response header token" msgstr "校验协商响应失败：非法响应头令牌" -#: src/ne_auth.c:577 +#: src/ne_auth.c:593 #, c-format msgid "Negotiate response verification failure: %s" msgstr "磋商响应校验失败: %s" -#: src/ne_auth.c:699 +#: src/ne_auth.c:765 msgid "unknown algorithm in Digest challenge" msgstr "在摘要挑战中的算法不可识别" -#: src/ne_auth.c:703 +#: src/ne_auth.c:769 msgid "incompatible algorithm in Digest challenge" msgstr "在摘要挑战中的算法不兼容" -#: src/ne_auth.c:707 +#: src/ne_auth.c:773 msgid "missing parameter in Digest challenge" msgstr "在摘要挑战中的参数丢失" -#: src/ne_auth.c:711 +#: src/ne_auth.c:777 msgid "initial Digest challenge was stale" msgstr "陈旧的初始化摘要挑战" -#: src/ne_auth.c:718 +#: src/ne_auth.c:784 msgid "stale Digest challenge with new algorithm or realm" msgstr "陈旧的摘要挑战用于新算法或新领域" -#: src/ne_auth.c:730 +#: src/ne_auth.c:796 msgid "could not parse domain in Digest challenge" msgstr "在摘要挑战中的不能解析域" -#: src/ne_auth.c:1039 +#: src/ne_auth.c:1105 #, c-format msgid "Digest mutual authentication failure: missing parameters" msgstr "摘要互相认证失败：参数遗漏" -#: src/ne_auth.c:1044 +#: src/ne_auth.c:1110 #, c-format msgid "Digest mutual authentication failure: client nonce mismatch" msgstr "摘要互相认证失败：客户现时不匹配" -#: src/ne_auth.c:1054 +#: src/ne_auth.c:1120 #, c-format msgid "Digest mutual authentication failure: could not parse nonce count" msgstr "摘要互相认证失败：不能解析现时计数" -#: src/ne_auth.c:1059 +#: src/ne_auth.c:1125 #, c-format msgid "Digest mutual authentication failure: nonce count mismatch (%u not %u)" msgstr "摘要互相认证失败：现时计算不匹配 (应该是 %u，不是 %u)" -#: src/ne_auth.c:1102 +#: src/ne_auth.c:1168 #, c-format msgid "Digest mutual authentication failure: request-digest mismatch" msgstr "摘要互相认证失败：请求摘要不匹配" -#: src/ne_auth.c:1228 +#: src/ne_auth.c:1299 #, c-format msgid "ignored %s challenge" msgstr "被忽略的 %s 挑战" -#: src/ne_auth.c:1307 +#: src/ne_auth.c:1378 msgid "could not parse challenge" msgstr "不能解析挑战" @@ -172,22 +172,41 @@ msgstr "[非打印字符:#%lu]" msgid "[unprintable]" msgstr "[非打印字符]" -#: src/ne_gnutls.c:799 src/ne_openssl.c:396 +#: src/ne_gnutls.c:817 +msgid "signed using insecure algorithm" +msgstr "" + +#: src/ne_gnutls.c:820 +#, c-format +msgid "unrecognized errors (%u)" +msgstr "" + +#: src/ne_gnutls.c:865 src/ne_openssl.c:468 #, c-format msgid "Server certificate was missing commonName attribute in subject name" msgstr "服务器证书在主题名称遗漏了属性 commonName" -#: src/ne_gnutls.c:840 src/ne_openssl.c:633 +#: src/ne_gnutls.c:879 +#, fuzzy, c-format +msgid "Could not verify server certificate: %s" +msgstr "不能写入文件：%s" + +#: src/ne_gnutls.c:891 src/ne_openssl.c:455 +#, c-format +msgid "Certificate verification error: %s" +msgstr "证书校验失败：%s" + +#: src/ne_gnutls.c:924 src/ne_openssl.c:674 #, c-format msgid "SSL handshake failed, client certificate was requested: %s" msgstr "" -#: src/ne_gnutls.c:845 src/ne_openssl.c:638 +#: src/ne_gnutls.c:929 src/ne_openssl.c:679 #, fuzzy, c-format msgid "SSL handshake failed: %s" msgstr "SSL 协商失败：%s" -#: src/ne_gnutls.c:855 +#: src/ne_gnutls.c:939 #, c-format msgid "Server did not send certificate chain" msgstr "服务器不能发送证书链" @@ -206,17 +225,12 @@ msgstr "锁定 %s 的响应遗漏了主动锁" msgid "No activelock for <%s> returned in LOCK refresh response" msgstr "刷新锁定 %s 的响应没有返回主动锁" -#: src/ne_openssl.c:428 -#, c-format -msgid "Certificate verification error: %s" -msgstr "证书校验失败：%s" - -#: src/ne_openssl.c:658 +#: src/ne_openssl.c:699 #, c-format msgid "SSL server did not present certificate" msgstr "SSL 服务器不能呈现证书" -#: src/ne_openssl.c:667 +#: src/ne_openssl.c:708 #, c-format msgid "Server certificate changed: connection intercepted?" msgstr "服务器证书改变：是否被拦截攻击？" @@ -258,112 +272,132 @@ msgstr "在请求主体文件不能定位到偏移 %s： %s" msgid "Could not send request body" msgstr "不能发送请求主体" -#: src/ne_request.c:703 +#: src/ne_request.c:707 msgid "Could not read chunk size" msgstr "不能读块大小" -#: src/ne_request.c:710 +#: src/ne_request.c:714 msgid "Could not parse chunk size" msgstr "不能解析块大小" -#: src/ne_request.c:747 +#: src/ne_request.c:751 msgid "Could not read response body" msgstr "不能读取响应主体" -#: src/ne_request.c:763 +#: src/ne_request.c:767 msgid "Could not read chunk delimiter" msgstr "不能读块分割符" -#: src/ne_request.c:766 +#: src/ne_request.c:770 msgid "Chunk delimiter was invalid" msgstr "非法的分割符" -#: src/ne_request.c:872 +#: src/ne_request.c:875 msgid "Could not read status line" msgstr "不能读状态行" -#: src/ne_request.c:894 +#: src/ne_request.c:897 msgid "Could not parse response status line" msgstr "不能解析响应状态行" -#: src/ne_request.c:906 +#: src/ne_request.c:909 msgid "Could not read interim response headers" msgstr "不能读临时响应头" -#: src/ne_request.c:940 +#: src/ne_request.c:943 msgid "Could not send request" msgstr "不能发送请求" -#: src/ne_request.c:988 src/ne_request.c:1006 src/ne_request.c:1016 +#: src/ne_request.c:991 src/ne_request.c:1009 src/ne_request.c:1019 msgid "Error reading response headers" msgstr "读取响应头出错" -#: src/ne_request.c:1034 +#: src/ne_request.c:1037 #, c-format msgid "Response header too long" msgstr "响应头太长" -#: src/ne_request.c:1116 +#: src/ne_request.c:1119 msgid "Response exceeded maximum number of header fields" msgstr "响应头的域数量超出了最大数量" -#: src/ne_request.c:1133 +#: src/ne_request.c:1134 #, c-format msgid "Could not resolve hostname `%s': %s" msgstr "不能解析主机名称 “%s”: %s" -#: src/ne_request.c:1264 +#: src/ne_request.c:1265 msgid "Unknown transfer-coding in response" msgstr "响应中的传输代码未知" -#: src/ne_request.c:1275 +#: src/ne_request.c:1278 msgid "Invalid Content-Length in response" msgstr "非法的 Content-Length 响应域" -#: src/ne_request.c:1348 +#: src/ne_request.c:1351 #, c-format msgid "Could not write to file: %s" msgstr "不能写入文件：%s" -#: src/ne_request.c:1421 +#: src/ne_request.c:1424 #, c-format msgid "Could not create SSL connection through proxy server: %s" msgstr "不能通过代理服务器 “%s” 创建 SSL 连接" -#: src/ne_request.c:1468 +#: src/ne_request.c:1463 #, c-format msgid "Could not create socket" msgstr "不能创建套接字" -#: src/ne_request.c:1530 +#: src/ne_request.c:1496 +msgid "Could not connect to server" +msgstr "不能连接到服务器" + +#: src/ne_request.c:1498 msgid "Could not connect to proxy server" msgstr "不能连接到代理服务器" -#: src/ne_request.c:1531 -msgid "Could not connect to server" -msgstr "不能连接到服务器" +#: src/ne_request.c:1541 +#, c-format +msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy" +msgstr "" -#: src/ne_session.c:361 src/ne_session.c:372 +#: src/ne_request.c:1599 +#, fuzzy, c-format +msgid "Could not establish connection from SOCKS proxy (%s:%u): %s" +msgstr "不能通过代理服务器 “%s” 创建 SSL 连接" + +#: src/ne_session.c:528 src/ne_session.c:539 msgid "[invalid date]" msgstr "[非法日期]" -#: src/ne_session.c:385 +#: src/ne_session.c:552 msgid "certificate is not yet valid" msgstr "证书还未生效" -#: src/ne_session.c:386 +#: src/ne_session.c:553 msgid "certificate has expired" msgstr "证书已经过时" -#: src/ne_session.c:387 +#: src/ne_session.c:554 msgid "certificate issued for a different hostname" msgstr "此证书是为不同的主机名称颁发" -#: src/ne_session.c:388 +#: src/ne_session.c:555 msgid "issuer is not trusted" msgstr "证书发行者不被信任" -#: src/ne_session.c:393 +#: src/ne_session.c:556 +#, fuzzy +msgid "bad certificate chain" +msgstr "证书已经过时" + +#: src/ne_session.c:557 +#, fuzzy +msgid "certificate has been revoked" +msgstr "证书已经过时" + +#: src/ne_session.c:562 msgid "Server certificate verification failed: " msgstr "服务器证书校验失败" @@ -394,39 +428,39 @@ msgstr "收到 SSL 警报： %s" msgid "SSL socket read failed" msgstr "SSL 套接字读取失败" -#: src/ne_socket.c:862 +#: src/ne_socket.c:867 msgid "Line too long" msgstr "行太长" -#: src/ne_socket.c:1007 src/ne_socket.c:1013 +#: src/ne_socket.c:1012 src/ne_socket.c:1018 msgid "Host not found" msgstr "没有发现主机" -#: src/ne_socket.c:1138 +#: src/ne_socket.c:1221 msgid "Connection timed out" msgstr "连接超时" -#: src/ne_socket.c:1300 +#: src/ne_socket.c:1412 msgid "Socket descriptor number exceeds FD_SETSIZE" msgstr "套接字数量超过 FD_SETSIZE" -#: src/ne_socket.c:1360 +#: src/ne_socket.c:1474 msgid "Socket family not supported" msgstr "" -#: src/ne_socket.c:1583 +#: src/ne_socket.c:1701 msgid "Client certificate verification failed" msgstr "客户证书校验失败" -#: src/ne_socket.c:1599 +#: src/ne_socket.c:1717 msgid "SSL disabled due to lack of entropy" msgstr "由于缺少熵，SSL 已经禁用" -#: src/ne_socket.c:1606 +#: src/ne_socket.c:1724 msgid "SSL disabled due to library version mismatch" msgstr "由于库版本不匹配，SSL 已经禁用" -#: src/ne_socket.c:1612 +#: src/ne_socket.c:1730 msgid "Could not create SSL structure" msgstr "不能创建 SSL 结构" @@ -566,15 +600,15 @@ msgstr "不能读取响应主体" msgid "XML parse error at line %d: invalid element name" msgstr "在 %d 行解析 XML 错误：非法元素名称" -#: src/ne_xml.c:452 +#: src/ne_xml.c:474 msgid "Unknown error" msgstr "未知错误" -#: src/ne_xml.c:537 +#: src/ne_xml.c:579 msgid "Invalid Byte Order Mark" msgstr "非法字节顺序标记(BOM)" -#: src/ne_xml.c:625 +#: src/ne_xml.c:667 #, c-format msgid "XML parse error at line %d: %s" msgstr "在 %d 行解析 XML 错误: %s" diff --git a/src/ne_utils.c b/src/ne_utils.c index 5b120c8..93985af 100644 --- a/src/ne_utils.c +++ b/src/ne_utils.c @@ -118,9 +118,6 @@ static const char version_string[] = "neon " NEON_VERSION ": " #ifdef HAVE_GNUTLS ", GNU TLS " LIBGNUTLS_VERSION #endif /* HAVE_GNUTLS */ -#ifdef HAVE_SSPI - ", SSPI" -#endif /* HAVE_SSPI */ "." ; @@ -140,7 +137,7 @@ int ne_has_support(int feature) switch (feature) { #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \ || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \ - || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI) + || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) #ifdef NE_HAVE_SSL case NE_FEATURE_SSL: #endif @@ -162,9 +159,6 @@ int ne_has_support(int feature) #ifdef NE_HAVE_I18N case NE_FEATURE_I18N: #endif -#ifdef HAVE_SSPI - case NE_FEATURE_SSPI: -#endif return 1; #endif /* NE_HAVE_* */ default: diff --git a/src/ne_utils.h b/src/ne_utils.h index c298cf9..d23a945 100644 --- a/src/ne_utils.h +++ b/src/ne_utils.h @@ -54,7 +54,6 @@ int ne_version_match(int major, int minor); #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ #define NE_FEATURE_I18N (7) /* i18n error message support */ -#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */ /* Returns non-zero if library is built with support for the given * NE_FEATURE_* feature code 'code'. */ diff --git a/src/neon.vers b/src/neon.vers index 391cb24..e482b5e 100644 --- a/src/neon.vers +++ b/src/neon.vers @@ -12,4 +12,5 @@ NEON_0_29 { ne_acl3744_set; ne_buffer_qappend; ne_strnqdup; + ne_iaddr_parse; }; diff --git a/test/auth.c b/test/auth.c index 692c37b..4281e40 100644 --- a/test/auth.c +++ b/test/auth.c @@ -318,7 +318,7 @@ static int retries(void) /* crashes with neon <0.22 */ static int forget_regress(void) { - ne_session *sess = ne_session_create("http", "localhost", 1234); + ne_session *sess = ne_session_create("http", "localhost", 7777); ne_forget_auth(sess); ne_session_destroy(sess); return OK; @@ -333,14 +333,13 @@ static int fail_auth_cb(void *ud, const char *realm, int attempt, /* this may trigger a segfault in neon 0.21.x and earlier. */ static int tunnel_regress(void) { - ne_session *sess; - - CALL(proxied_session_server(&sess, "http", "localhost", 443, - single_serve_string, - "HTTP/1.1 401 Auth failed.\r\n" - "WWW-Authenticate: Basic realm=asda\r\n" - "Content-Length: 0\r\n\r\n")); + ne_session *sess = ne_session_create("https", "localhost", 443); + ne_session_proxy(sess, "localhost", 7777); ne_set_server_auth(sess, fail_auth_cb, NULL); + CALL(spawn_server(7777, single_serve_string, + "HTTP/1.1 401 Auth failed.\r\n" + "WWW-Authenticate: Basic realm=asda\r\n" + "Content-Length: 0\r\n\r\n")); any_request(sess, "/foo"); ne_session_destroy(sess); CALL(await_server()); @@ -351,13 +350,12 @@ static int tunnel_regress(void) * token. */ static int negotiate_regress(void) { - ne_session *sess; - - CALL(session_server(&sess, single_serve_string, - "HTTP/1.1 401 Auth failed.\r\n" - "WWW-Authenticate: Negotiate\r\n" - "Content-Length: 0\r\n\r\n")); + ne_session *sess = ne_session_create("http", "localhost", 7777); ne_set_server_auth(sess, fail_auth_cb, NULL); + CALL(spawn_server(7777, single_serve_string, + "HTTP/1.1 401 Auth failed.\r\n" + "WWW-Authenticate: Negotiate\r\n" + "Content-Length: 0\r\n\r\n")); any_request(sess, "/foo"); ne_session_destroy(sess); CALL(await_server()); @@ -791,15 +789,17 @@ static int test_digest(struct digest_parms *parms) parms->stale); if (parms->proxy) { - CALL(proxied_session_server(&sess, "http", "www.example.com", 80, - serve_digest, parms)); + sess = ne_session_create("http", "www.example.com", 80); + ne_session_proxy(sess, "localhost", 7777); ne_set_proxy_auth(sess, auth_cb, NULL); } else { - CALL(session_server(&sess, serve_digest, parms)); + sess = ne_session_create("http", "localhost", 7777); ne_set_server_auth(sess, auth_cb, NULL); } + CALL(spawn_server(7777, serve_digest, parms)); + do { CALL(any_2xx_request(sess, "/fish")); } while (--parms->num_requests); @@ -879,7 +879,7 @@ static int digest_failures(void) parms.num_requests = 1; for (n = 0; fails[n].message; n++) { - ne_session *sess; + ne_session *sess = ne_session_create("http", "localhost", 7777); int ret; parms.failure = fails[n].mode; @@ -892,9 +892,8 @@ static int digest_failures(void) NE_DEBUG(NE_DBG_HTTP, ">>> New Digest failure test, " "expecting failure '%s'\n", fails[n].message); - CALL(session_server(&sess, serve_digest, &parms)); - ne_set_server_auth(sess, auth_cb, NULL); + CALL(spawn_server(7777, serve_digest, &parms)); ret = any_2xx_request(sess, "/fish"); ONV(ret == NE_OK, @@ -1068,14 +1067,15 @@ static int domains(void) parms.realm = "WallyWorld"; parms.rfc2617 = 1; parms.nonce = "agoog"; - parms.domain = "http://localhost:4242/fish/ https://example.com /agaor /other"; + parms.domain = "http://localhost:7777/fish/ https://example.com /agaor /other"; parms.num_requests = 6; - CALL(proxied_session_server(&sess, "http", "localhost", 4242, - serve_digest, &parms)); + CALL(make_session(&sess, serve_digest, &parms)); ne_set_server_auth(sess, auth_cb, NULL); + ne_session_proxy(sess, "localhost", 7777); + CALL(any_2xx_request(sess, "/fish/0")); CALL(any_2xx_request(sess, "/outside")); CALL(any_2xx_request(sess, "/others")); @@ -1101,11 +1101,12 @@ static int CVE_2008_3746(void) parms.domain = "foo"; parms.num_requests = 1; - CALL(proxied_session_server(&sess, "http", "www.example.com", 80, - serve_digest, &parms)); + CALL(make_session(&sess, serve_digest, &parms)); ne_set_server_auth(sess, auth_cb, NULL); + ne_session_proxy(sess, "localhost", 7777); + any_2xx_request(sess, "/fish/0"); ne_session_destroy(sess); diff --git a/test/common/child.c b/test/common/child.c index 3cf9a3f..d8f5c2b 100644 --- a/test/common/child.c +++ b/test/common/child.c @@ -1,6 +1,6 @@ /* Framework for testing with a server process - Copyright (C) 2001-2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2001-2008, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -315,63 +315,6 @@ int spawn_server_repeat(int port, server_fn fn, void *userdata, int n) return OK; } -int new_spawn_server(int count, server_fn fn, void *userdata, - unsigned int *port) -{ - struct sockaddr_in sa; - socklen_t salen = sizeof sa; - int ls; - - ls = do_listen(lh_addr, 0); - ONN("could not bind/listen fd for server", ls < 0); - - ONV(getsockname(ls, &sa, &salen) != 0, - ("could not get socket name for listening fd: %s", - strerror(errno))); - - *port = ntohs(sa.sin_port); - - NE_DEBUG(NE_DBG_SOCKET, "child using port %u\n", *port); - - NE_DEBUG(NE_DBG_SOCKET, "child forking now...\n"); - - child = fork(); - ONN("failed to fork server", child == -1); - - if (child == 0) { - int ret, iter = 1; - - in_child(); - - do { - ne_socket *sock = ne_sock_create(); - - NE_DEBUG(NE_DBG_HTTP, "child iteration #%d (of %d), " - "awaiting connection...\n", iter, count); - - if (ne_sock_accept(sock, ls)) { - t_context("Server child could not accept connection: %s", - ne_sock_error(sock)); - exit(FAIL); - } - - NE_DEBUG(NE_DBG_HTTP, "child got connection, invoking server\n"); - ret = fn(sock, userdata); - NE_DEBUG(NE_DBG_HTTP, "child iteration #%d returns %d\n", - iter, ret); - - close_socket(sock); - } while (ret == 0 && ++iter <= count); - - NE_DEBUG(NE_DBG_HTTP, "child terminating with %d\n", ret); - exit(ret); - } - - close(ls); - - return OK; -} - int dead_server(void) { int status; diff --git a/test/common/child.h b/test/common/child.h index ababb87..39bdb1d 100644 --- a/test/common/child.h +++ b/test/common/child.h @@ -1,6 +1,6 @@ /* Framework for testing with a server process - Copyright (C) 2001-2004, 2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,12 +63,6 @@ int spawn_server_addr(int bind_local, int port, server_fn fn, void *userdata); * child process exits with a failure status. */ int spawn_server_repeat(int port, server_fn fn, void *userdata, int n); -/* Forks a server child process running 'fn(userdata)' on an - * unspecified port. Sets test suite error on failure; on success, - * sets *port to bound port number. */ -int new_spawn_server(int count, server_fn fn, void *userdata, - unsigned int *port); - /* Blocks until child process exits, and gives return code of 'fn'. */ int await_server(void); diff --git a/test/props.c b/test/props.c index ce650f9..fc12732 100644 --- a/test/props.c +++ b/test/props.c @@ -1,6 +1,6 @@ /* Tests for property handling - Copyright (C) 2002-2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2002-2008, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -242,15 +242,13 @@ static int tos_endprop(void *userdata, int state, static int run_207_response(char *resp, const char *expected) { ne_buffer *buf = ne_buffer_create(); - ne_session *sess; + ne_session *sess = ne_session_create("http", "localhost", 7777); ne_xml_parser *p = ne_xml_create(); ne_207_parser *p207; - ne_request *req; + ne_request *req = ne_request_create(sess, "PROPFIND", "/foo"); ne_uri base = {0}; struct propctx ctx; - CALL(session_server(&sess, single_serve_string, resp)); - req = ne_request_create(sess, "PROPFIND", "/foo"); ne_fill_server_uri(sess, &base); base.path = ne_strdup("/foo"); p207 = ne_207_create(p, &base, buf); @@ -265,6 +263,7 @@ static int run_207_response(char *resp, const char *expected) ctx.p207 = p207; ne_xml_push_handler(p, tos_startprop, tos_cdata, tos_endprop, &ctx); + CALL(spawn_server(7777, single_serve_string, resp)); ONREQ(ne_request_dispatch(req)); @@ -593,14 +592,14 @@ static int propfind(void) 0, PF_SIMPLE}, /* whitespace handling. */ - { MULTI_207(RESP_207("\r\nhttp://localhost/alpha ", + { MULTI_207(RESP_207("\r\nhttp://localhost:7777/alpha ", PSTAT_207(PROPS_207(APROP_207("alpha", "beta")) "<D:status>\r\nHTTP/1.1 200 OK </D:status>"))), "results(/alpha,prop:[{DAV:,alpha}='beta':{200 OK}];)//", 0, PF_SIMPLE}, /* attribute handling. */ - { MULTI_207(RESP_207("\r\nhttp://localhost/alpha ", + { MULTI_207(RESP_207("\r\nhttp://localhost:7777/alpha ", PSTAT_207(PROPS_207("<D:alpha>" "<D:foo D:fee='bar' bar='fee'>beta</D:foo></D:alpha>") "<D:status>\r\nHTTP/1.1 200 OK </D:status>"))), diff --git a/test/redirect.c b/test/redirect.c index 062528e..80b23bb 100644 --- a/test/redirect.c +++ b/test/redirect.c @@ -74,19 +74,10 @@ static int check_redir(struct redir_args *args, const char *expect) ne_session *sess; const ne_uri *loc; char *unp; - char *full_expect = NULL; CALL(make_session(&sess, serve_redir, args)); ne_redirect_register(sess); - if (expect[0] == '/') { - ne_uri uri = {0}; - ne_fill_server_uri(sess, &uri); - uri.path = (char *)expect; - full_expect = ne_uri_unparse(&uri); - expect = full_expect; - } - CALL(process_redir(sess, args->path, &loc)); ONN("redirect location was NULL", loc == NULL); @@ -96,7 +87,6 @@ static int check_redir(struct redir_args *args, const char *expect) ne_session_destroy(sess); CALL(await_server()); - if (full_expect) ne_free(full_expect); return OK; } @@ -125,19 +115,19 @@ static int simple(void) static int non_absolute(void) { struct redir_args args = {302, "/foo/bar/blah", PATH}; - return check_redir(&args, "/foo/bar/blah"); + return check_redir(&args, "http://localhost:7777/foo/bar/blah"); } static int relative_1(void) { struct redir_args args = {302, "norman", "/foo/bar"}; - return check_redir(&args, "/foo/norman"); + return check_redir(&args, "http://localhost:7777/foo/norman"); } static int relative_2(void) { struct redir_args args = {302, "wishbone", "/foo/bar/"}; - return check_redir(&args, "/foo/bar/wishbone"); + return check_redir(&args, "http://localhost:7777/foo/bar/wishbone"); } #if 0 @@ -164,21 +154,22 @@ static int fail_loop(void) * been encountered, or redirect hooks aren't registered. */ static int no_redirect(void) { - ne_session *sess; + ne_session *sess = ne_session_create("http", "localhost", 7777); const ne_uri *loc; - CALL(session_server(&sess, single_serve_string, - "HTTP/1.1 200 OK\r\n" "Content-Length: 0\r\n\r\n" - "HTTP/1.0 302 Get Ye Away\r\n" - "Location: /blah\r\n" "\r\n")); ONN("redirect non-NULL before register", ne_redirect_location(sess)); ne_redirect_register(sess); ONN("initial redirect non-NULL", ne_redirect_location(sess)); + CALL(spawn_server(7777, single_serve_string, + "HTTP/1.0 200 OK\r\n\r\n\r\n")); ONREQ(any_request(sess, "/noredir")); + CALL(await_server()); ONN("redirect non-NULL after non-redir req", ne_redirect_location(sess)); + CALL(spawn_server(7777, single_serve_string, "HTTP/1.0 302 Get Ye Away\r\n" + "Location: /blah\r\n" "\r\n")); CALL(process_redir(sess, "/foo", &loc)); CALL(await_server()); diff --git a/test/session.c b/test/session.c index e5a0ee6..e8aee3c 100644 --- a/test/session.c +++ b/test/session.c @@ -1,6 +1,6 @@ /* Tests for session handling - Copyright (C) 2002-2006, 2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2002-2006, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,12 +36,12 @@ static int fill_uri(void) { ne_uri uri = {0}; - ne_session *sess = ne_session_create("http", "localhost", 1234); + ne_session *sess = ne_session_create("http", "localhost", 7777); ne_fill_server_uri(sess, &uri); ONCMP("localhost", uri.host, "fill_uri", "host"); - ONN("port mis-match", uri.port != 1234); + ONN("port mis-match", uri.port != 7777); ONCMP("http", uri.scheme, "fill_uri", "scheme"); ne_session_destroy(sess); @@ -53,7 +53,7 @@ static int fill_uri(void) static int fill_proxy_uri(void) { ne_uri uri = {0}; - ne_session *sess = ne_session_create("http", "localhost", 1234); + ne_session *sess = ne_session_create("http", "localhost", 7777); ne_fill_proxy_uri(sess, &uri); diff --git a/test/socket.c b/test/socket.c index 5aeca7b..f461a88 100644 --- a/test/socket.c +++ b/test/socket.c @@ -168,11 +168,10 @@ static int wrap_serve(ne_socket *sock, void *ud) static int begin(ne_socket **sock, server_fn fn, void *ud) { struct serve_pair pair; - unsigned int port; pair.fn = fn; pair.userdata = ud; - CALL(new_spawn_server(1, wrap_serve, &pair, &port)); - CALL(do_connect(sock, localhost, port)); + CALL(spawn_server(7777, wrap_serve, &pair)); + CALL(do_connect(sock, localhost, 7777)); ONV(ne_sock_connect_ssl(*sock, client_ctx, NULL), ("SSL negotation failed: %s", ne_sock_error(*sock))); return OK; @@ -182,9 +181,8 @@ static int begin(ne_socket **sock, server_fn fn, void *ud) /* non-SSL begin() function. */ static int begin(ne_socket **sock, server_fn fn, void *ud) { - unsigned int port; - CALL(new_spawn_server(1, fn, ud, &port)); - return do_connect(sock, localhost, port); + CALL(spawn_server(7777, fn, ud)); + return do_connect(sock, localhost, 7777); } #endif @@ -401,13 +399,12 @@ static int addr_connect(void) { ne_socket *sock = ne_sock_create(); ne_inet_addr *ia; - unsigned int port; ia = ne_iaddr_make(ne_iaddr_ipv4, raw_127); ONN("ne_iaddr_make returned NULL", ia == NULL); - CALL(new_spawn_server(1, serve_close, NULL, &port)); - ONN("could not connect", ne_sock_connect(sock, ia, port)); + CALL(spawn_server(7777, serve_close, NULL)); + ONN("could not connect", ne_sock_connect(sock, ia, 7777)); ne_sock_close(sock); CALL(await_server()); @@ -419,21 +416,21 @@ static int addr_peer(void) { ne_socket *sock = ne_sock_create(); ne_inet_addr *ia, *ia2; - unsigned int port = 9999, realport; + unsigned int port = 9999; int ret; ia = ne_iaddr_make(ne_iaddr_ipv4, raw_127); ONN("ne_iaddr_make returned NULL", ia == NULL); - CALL(new_spawn_server(1, serve_close, NULL, &realport)); - ONN("could not connect", ne_sock_connect(sock, ia, realport)); + CALL(spawn_server(7777, serve_close, NULL)); + ONN("could not connect", ne_sock_connect(sock, ia, 7777)); ia2 = ne_sock_peer(sock, &port); ret = ne_iaddr_cmp(ia, ia2); ONV(ret != 0, ("comparison of peer with server address was %d", ret)); - ONV(port != realport, ("got peer port %u, expected %u", port, realport)); + ONV(port != 7777, ("got peer port %u", port)); ne_sock_close(sock); CALL(await_server()); @@ -1194,16 +1191,15 @@ static int try_prebind(int addr, int port) ne_socket *sock = ne_sock_create(); ne_inet_addr *ia; char buf[128], line[256]; - unsigned int srvport; ia = ne_iaddr_make(ne_iaddr_ipv4, raw_127); ONN("ne_iaddr_make returned NULL", ia == NULL); - CALL(new_spawn_server(1, serve_ppeer, NULL, &srvport)); + CALL(spawn_server(7777, serve_ppeer, NULL)); ne_sock_prebind(sock, addr ? ia : NULL, port ? 7778 : 0); - ONN("could not connect", ne_sock_connect(sock, ia, srvport)); + ONN("could not connect", ne_sock_connect(sock, ia, 7777)); ne_snprintf(line, sizeof line, "%s@%d\n", ne_iaddr_print(ia, buf, sizeof buf), @@ -1295,12 +1291,11 @@ static int error(void) static int begin_socks(ne_socket **sock, struct socks_server *srv, server_fn server, void *userdata) { - unsigned int port; srv->server = server; srv->userdata = userdata; srv->say_hello = 1; - CALL(new_spawn_server(1, socks_server, srv, &port)); - return do_connect(sock, localhost, port); + CALL(spawn_server(7777, socks_server, srv)); + return do_connect(sock, localhost, 7777); } static int socks_proxy(void) @@ -408,13 +408,18 @@ static int simple(void) /* Test for SSL operation when server uses SSLv2 */ static int simple_sslv2(void) { +#ifdef HAVE_OPENSSL + return SKIP; /* this is breaking with current SSL. */ +#else ne_session *sess = ne_session_create("https", "localhost", 7777); struct ssl_server_args args = {SERVER_CERT, 0}; args.use_ssl2 = 1; + ne_set_session_flag(sess, NE_SESSFLAG_SSLv2, 1); CALL(any_ssl_request(sess, ssl_server, &args, CA_CERT, NULL, NULL)); ne_session_destroy(sess); return OK; +#endif } /* Serves using HTTP/1.0 get-till-EOF semantics. */ diff --git a/test/stubs.c b/test/stubs.c index 0042b15..6243190 100644 --- a/test/stubs.c +++ b/test/stubs.c @@ -95,7 +95,7 @@ static int stub_decompress(void) #ifndef NE_HAVE_SSL static int stub_ssl(void) { - ne_session *sess = ne_session_create("https", "localhost", 1234); + ne_session *sess = ne_session_create("https", "localhost", 7777); ne_ssl_certificate *cert; ne_ssl_client_cert *cc; diff --git a/test/utils.c b/test/utils.c index 4b781d0..cda4cc9 100644 --- a/test/utils.c +++ b/test/utils.c @@ -1,6 +1,6 @@ /* Utility functions for HTTP client tests - Copyright (C) 2001-2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2001-2008, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,12 @@ #include "tests.h" #include "utils.h" +int make_session(ne_session **sess, server_fn fn, void *ud) +{ + *sess = ne_session_create("http", "localhost", 7777); + return spawn_server(7777, fn, ud); +} + static int serve_response(ne_socket *s, const char *response) { CALL(discard_request(s)); @@ -174,33 +180,3 @@ int full_write(ne_socket *sock, const char *data, size_t len) return OK; } -int session_server(ne_session **sess, server_fn fn, void *userdata) -{ - unsigned int port; - - CALL(new_spawn_server(1, fn, userdata, &port)); - - *sess = ne_session_create("http", "localhost", port); - - return OK; -} - -int proxied_session_server(ne_session **sess, const char *scheme, - const char *host, unsigned int fakeport, - server_fn fn, void *userdata) -{ - unsigned int port; - - CALL(new_spawn_server(1, fn, userdata, &port)); - - *sess = ne_session_create(scheme, host, fakeport); - - ne_session_proxy(*sess, "localhost", port); - - return OK; -} - -int make_session(ne_session **sess, server_fn fn, void *ud) -{ - return session_server(sess, fn, ud); -} diff --git a/test/utils.h b/test/utils.h index 934d597..d384faf 100644 --- a/test/utils.h +++ b/test/utils.h @@ -1,6 +1,6 @@ /* neon-specific test utils - Copyright (C) 2001-2009, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2001-2008, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -110,18 +110,4 @@ int socks_server(ne_socket *sock, void *userdata); int full_write(ne_socket *sock, const char *data, size_t len); -/* Create a session with server process running fn(userdata). Sets - * test suite error on failure; initializes *sess with a new session - * on success. Uses an unspecified hostname/port for the server. */ -int session_server(ne_session **sess, server_fn fn, void *userdata); - -/* Create a session with server process running fn(userdata). Sets - * test suite error on failure; initializes *sess with a new session - * on success. Uses an unspecified hostname/port for the server; - * session is created as if using origin 'host:fakeport' via proxy to - * spawned server. */ -int proxied_session_server(ne_session **sess, const char *scheme, - const char *host, unsigned int fakeport, - server_fn fn, void *userdata); - #endif /* UTILS_H */ |