Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
2cc0095c
Kaydet (Commit)
2cc0095c
authored
Ara 13, 2016
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:salbool
Change-Id: Ia2a2c900bf8bf8ecee2edf130b8ca58f7f35b6aa
üst
f409daff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
SerfSession.cxx
ucb/source/ucp/webdav/SerfSession.cxx
+5
-5
webdavcontent.cxx
ucb/source/ucp/webdav/webdavcontent.cxx
+1
-1
No files found.
ucb/source/ucp/webdav/SerfSession.cxx
Dosyayı görüntüle @
2cc0095c
...
@@ -492,7 +492,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
...
@@ -492,7 +492,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
if
(
nVerificationResult
==
0
)
if
(
nVerificationResult
==
0
)
{
{
// Certificate (chain) is valid.
// Certificate (chain) is valid.
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
sal_T
rue
);
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
t
rue
);
return
APR_SUCCESS
;
return
APR_SUCCESS
;
}
}
else
if
((
nVerificationResult
&
security
::
CertificateValidity
::
CHAIN_INCOMPLETE
)
!=
0
)
else
if
((
nVerificationResult
&
security
::
CertificateValidity
::
CHAIN_INCOMPLETE
)
!=
0
)
...
@@ -506,7 +506,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
...
@@ -506,7 +506,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
(
security
::
CertificateValidity
::
INVALID
|
security
::
CertificateValidity
::
REVOKED
))
!=
0
)
(
security
::
CertificateValidity
::
INVALID
|
security
::
CertificateValidity
::
REVOKED
))
!=
0
)
{
{
// Certificate (chain) is invalid.
// Certificate (chain) is invalid.
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
sal_F
alse
);
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
f
alse
);
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
}
}
else
else
...
@@ -536,13 +536,13 @@ apr_status_t SerfSession::verifySerfCertificateChain (
...
@@ -536,13 +536,13 @@ apr_status_t SerfSession::verifySerfCertificateChain (
uno
::
Reference
<
task
::
XInteractionApprove
>
xApprove
(
xSelection
.
get
(),
uno
::
UNO_QUERY
);
uno
::
Reference
<
task
::
XInteractionApprove
>
xApprove
(
xSelection
.
get
(),
uno
::
UNO_QUERY
);
if
(
xApprove
.
is
()
)
if
(
xApprove
.
is
()
)
{
{
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
sal_T
rue
);
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
t
rue
);
return
APR_SUCCESS
;
return
APR_SUCCESS
;
}
}
else
else
{
{
// Don't trust cert
// Don't trust cert
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
sal_F
alse
);
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
f
alse
);
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
}
}
}
}
...
@@ -550,7 +550,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
...
@@ -550,7 +550,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
else
else
{
{
// Don't trust cert
// Don't trust cert
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
sal_F
alse
);
xCertificateContainer
->
addCertificate
(
getHostName
(),
sServerCertificateSubject
,
f
alse
);
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
}
}
}
}
...
...
ucb/source/ucp/webdav/webdavcontent.cxx
Dosyayı görüntüle @
2cc0095c
...
@@ -2715,7 +2715,7 @@ void Content::transfer(
...
@@ -2715,7 +2715,7 @@ void Content::transfer(
xResAccess
->
getSessionFactory
(),
xResAccess
->
getSessionFactory
(),
sourceURI
.
GetURI
()
);
sourceURI
.
GetURI
()
);
if
(
rArgs
.
MoveData
==
sal_True
)
if
(
rArgs
.
MoveData
)
{
{
uno
::
Reference
<
ucb
::
XContentIdentifier
>
xId
uno
::
Reference
<
ucb
::
XContentIdentifier
>
xId
=
new
::
ucbhelper
::
ContentIdentifier
(
rArgs
.
SourceURL
);
=
new
::
ucbhelper
::
ContentIdentifier
(
rArgs
.
SourceURL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment