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
54a7c24e
Kaydet (Commit)
54a7c24e
authored
Ara 07, 2016
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:nullptr
Change-Id: Id8fd27ed20bc67a49d6863b63b07cf1573733744
üst
add4bc96
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
65 additions
and
64 deletions
+65
-64
AprEnv.cxx
ucb/source/ucp/webdav/AprEnv.cxx
+2
-2
ContentProperties.cxx
ucb/source/ucp/webdav/ContentProperties.cxx
+1
-1
DAVResourceAccess.hxx
ucb/source/ucp/webdav/DAVResourceAccess.hxx
+1
-1
SerfCopyReqProcImpl.cxx
ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+1
-1
SerfDeleteReqProcImpl.cxx
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+1
-1
SerfGetReqProcImpl.cxx
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
+7
-7
SerfHeadReqProcImpl.cxx
ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
+4
-3
SerfLockReqProcImpl.cxx
ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
+2
-2
SerfLockReqProcImpl.hxx
ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
+1
-1
SerfLockStore.cxx
ucb/source/ucp/webdav/SerfLockStore.cxx
+2
-2
SerfMkColReqProcImpl.cxx
ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+1
-1
SerfMoveReqProcImpl.cxx
ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+1
-1
SerfPostReqProcImpl.cxx
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+4
-4
SerfPropFindReqProcImpl.cxx
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+8
-8
SerfPropPatchReqProcImpl.cxx
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+4
-4
SerfPutReqProcImpl.cxx
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+2
-2
SerfRequestProcessor.cxx
ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+6
-6
SerfRequestProcessor.hxx
ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+1
-1
SerfRequestProcessorImpl.cxx
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+1
-1
SerfSession.cxx
ucb/source/ucp/webdav/SerfSession.cxx
+15
-15
No files found.
ucb/source/ucp/webdav/AprEnv.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -23,11 +23,11 @@ namespace apr_environment
...
@@ -23,11 +23,11 @@ namespace apr_environment
{
{
AprEnv
::
AprEnv
()
AprEnv
::
AprEnv
()
:
mpAprPool
(
0
)
:
mpAprPool
(
nullptr
)
{
{
apr_initialize
();
apr_initialize
();
apr_pool_create
(
&
mpAprPool
,
NULL
);
apr_pool_create
(
&
mpAprPool
,
nullptr
);
mpSerfLockStore
=
new
http_dav_ucp
::
SerfLockStore
();
mpSerfLockStore
=
new
http_dav_ucp
::
SerfLockStore
();
}
}
...
...
ucb/source/ucp/webdav/ContentProperties.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -189,7 +189,7 @@ const PropertyValue * ContentProperties::get(
...
@@ -189,7 +189,7 @@ const PropertyValue * ContentProperties::get(
++
it
;
++
it
;
}
}
return
0
;
return
nullptr
;
}
}
else
else
return
&
(
*
it
).
second
;
return
&
(
*
it
).
second
;
...
...
ucb/source/ucp/webdav/DAVResourceAccess.hxx
Dosyayı görüntüle @
54a7c24e
...
@@ -53,7 +53,7 @@ class DAVResourceAccess
...
@@ -53,7 +53,7 @@ class DAVResourceAccess
std
::
vector
<
SerfUri
>
m_aRedirectURIs
;
std
::
vector
<
SerfUri
>
m_aRedirectURIs
;
public
:
public
:
DAVResourceAccess
()
:
m_xSessionFactory
(
0
)
{}
DAVResourceAccess
()
:
m_xSessionFactory
(
nullptr
)
{}
DAVResourceAccess
(
const
css
::
uno
::
Reference
<
css
::
uno
::
XComponentContext
>
&
rContext
,
DAVResourceAccess
(
const
css
::
uno
::
Reference
<
css
::
uno
::
XComponentContext
>
&
rContext
,
rtl
::
Reference
<
DAVSessionFactory
>
const
&
rSessionFactory
,
rtl
::
Reference
<
DAVSessionFactory
>
const
&
rSessionFactory
,
const
OUString
&
rURL
);
const
OUString
&
rURL
);
...
...
ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -44,7 +44,7 @@ serf_bucket_t * SerfCopyReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -44,7 +44,7 @@ serf_bucket_t * SerfCopyReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"COPY"
,
"COPY"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
...
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -40,7 +40,7 @@ serf_bucket_t * SerfDeleteReqProcImpl::createSerfRequestBucket( serf_request_t *
...
@@ -40,7 +40,7 @@ serf_bucket_t * SerfDeleteReqProcImpl::createSerfRequestBucket( serf_request_t *
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"DELETE"
,
"DELETE"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
...
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -30,8 +30,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
...
@@ -30,8 +30,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
,
xInputStream
(
xioInStrm
)
,
xInputStream
(
xioInStrm
)
,
xOutputStream
()
,
xOutputStream
()
,
mpHeaderNames
(
0
)
,
mpHeaderNames
(
nullptr
)
,
mpResource
(
0
)
,
mpResource
(
nullptr
)
{
{
}
}
...
@@ -54,8 +54,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
...
@@ -54,8 +54,8 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
,
xInputStream
()
,
xInputStream
()
,
xOutputStream
(
xioOutStrm
)
,
xOutputStream
(
xioOutStrm
)
,
mpHeaderNames
(
0
)
,
mpHeaderNames
(
nullptr
)
,
mpResource
(
0
)
,
mpResource
(
nullptr
)
{
{
}
}
...
@@ -82,7 +82,7 @@ serf_bucket_t * SerfGetReqProcImpl::createSerfRequestBucket( serf_request_t * in
...
@@ -82,7 +82,7 @@ serf_bucket_t * SerfGetReqProcImpl::createSerfRequestBucket( serf_request_t * in
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"GET"
,
"GET"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
@@ -124,10 +124,10 @@ namespace
...
@@ -124,10 +124,10 @@ namespace
void
SerfGetReqProcImpl
::
handleEndOfResponseData
(
serf_bucket_t
*
inSerfResponseBucket
)
void
SerfGetReqProcImpl
::
handleEndOfResponseData
(
serf_bucket_t
*
inSerfResponseBucket
)
{
{
// read response header, if requested
// read response header, if requested
if
(
mpHeaderNames
!=
0
&&
mpResource
!=
0
)
if
(
mpHeaderNames
!=
nullptr
&&
mpResource
!=
nullptr
)
{
{
serf_bucket_t
*
SerfHeaderBucket
=
serf_bucket_response_get_headers
(
inSerfResponseBucket
);
serf_bucket_t
*
SerfHeaderBucket
=
serf_bucket_response_get_headers
(
inSerfResponseBucket
);
if
(
SerfHeaderBucket
!=
0
)
if
(
SerfHeaderBucket
!=
nullptr
)
{
{
serf_bucket_headers_do
(
SerfHeaderBucket
,
serf_bucket_headers_do
(
SerfHeaderBucket
,
Serf_ProcessResponseHeader
,
Serf_ProcessResponseHeader
,
...
...
ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -44,7 +44,8 @@ serf_bucket_t * SerfHeadReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -44,7 +44,8 @@ serf_bucket_t * SerfHeadReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"HEAD"
,
"HEAD"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
@@ -78,10 +79,10 @@ namespace
...
@@ -78,10 +79,10 @@ namespace
void
SerfHeadReqProcImpl
::
handleEndOfResponseData
(
serf_bucket_t
*
inSerfResponseBucket
)
void
SerfHeadReqProcImpl
::
handleEndOfResponseData
(
serf_bucket_t
*
inSerfResponseBucket
)
{
{
// read response header, if requested
// read response header, if requested
if
(
mpHeaderNames
!=
0
&&
mpResource
!=
0
)
if
(
mpHeaderNames
!=
nullptr
&&
mpResource
!=
nullptr
)
{
{
serf_bucket_t
*
SerfHeaderBucket
=
serf_bucket_response_get_headers
(
inSerfResponseBucket
);
serf_bucket_t
*
SerfHeaderBucket
=
serf_bucket_response_get_headers
(
inSerfResponseBucket
);
if
(
SerfHeaderBucket
!=
0
)
if
(
SerfHeaderBucket
!=
nullptr
)
{
{
serf_bucket_headers_do
(
SerfHeaderBucket
,
serf_bucket_headers_do
(
SerfHeaderBucket
,
Serf_ProcessResponseHeader
,
Serf_ProcessResponseHeader
,
...
...
ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -78,7 +78,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -78,7 +78,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
aBody
.
append
(
"</lockinfo>
\n
"
);
aBody
.
append
(
"</lockinfo>
\n
"
);
const
OString
aBodyText
(
aBody
.
makeStringAndClear
());
const
OString
aBodyText
(
aBody
.
makeStringAndClear
());
serf_bucket_t
*
body_bkt
=
0
;
serf_bucket_t
*
body_bkt
=
nullptr
;
if
(
!
m_plastChanceToSendRefreshRequest
)
if
(
!
m_plastChanceToSendRefreshRequest
)
body_bkt
=
serf_bucket_simple_copy_create
(
aBodyText
.
getStr
(),
body_bkt
=
serf_bucket_simple_copy_create
(
aBodyText
.
getStr
(),
...
@@ -101,7 +101,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -101,7 +101,7 @@ serf_bucket_t * SerfLockReqProcImpl::createSerfRequestBucket( serf_request_t * i
setRequestHeaders
(
hdrs_bkt
);
setRequestHeaders
(
hdrs_bkt
);
// request specific header fields
// request specific header fields
const
char
*
depth
=
0
;
const
char
*
depth
=
nullptr
;
switch
(
m_aLock
.
Depth
)
switch
(
m_aLock
.
Depth
)
{
{
case
css
:
:
ucb
::
LockDepth_ZERO
:
case
css
:
:
ucb
::
LockDepth_ZERO
:
...
...
ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
Dosyayı görüntüle @
54a7c24e
...
@@ -38,7 +38,7 @@ public:
...
@@ -38,7 +38,7 @@ public:
const
DAVRequestHeaders
&
inRequestHeaders
,
const
DAVRequestHeaders
&
inRequestHeaders
,
SerfSession
&
rSession
,
SerfSession
&
rSession
,
const
css
::
ucb
::
Lock
&
rLock
,
const
css
::
ucb
::
Lock
&
rLock
,
sal_Int32
*
plastChanceToSendRefreshRequest
=
0
);
sal_Int32
*
plastChanceToSendRefreshRequest
=
nullptr
);
virtual
~
SerfLockReqProcImpl
()
override
;
virtual
~
SerfLockReqProcImpl
()
override
;
...
...
ucb/source/ucp/webdav/SerfLockStore.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -76,7 +76,7 @@ void TickerThread::run()
...
@@ -76,7 +76,7 @@ void TickerThread::run()
SerfLockStore
::
SerfLockStore
()
SerfLockStore
::
SerfLockStore
()
:
m_pTickerThread
(
0
)
:
m_pTickerThread
(
nullptr
)
,
m_bFinishing
(
false
)
,
m_bFinishing
(
false
)
{
{
}
}
...
@@ -126,7 +126,7 @@ void SerfLockStore::stopTicker()
...
@@ -126,7 +126,7 @@ void SerfLockStore::stopTicker()
m_pTickerThread
->
finish
();
m_pTickerThread
->
finish
();
m_pTickerThread
->
join
();
m_pTickerThread
->
join
();
delete
m_pTickerThread
;
delete
m_pTickerThread
;
m_pTickerThread
=
0
;
m_pTickerThread
=
nullptr
;
}
}
}
}
...
...
ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -40,7 +40,7 @@ serf_bucket_t * SerfMkColReqProcImpl::createSerfRequestBucket( serf_request_t *
...
@@ -40,7 +40,7 @@ serf_bucket_t * SerfMkColReqProcImpl::createSerfRequestBucket( serf_request_t *
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"MKCOL"
,
"MKCOL"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
...
ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -44,7 +44,7 @@ serf_bucket_t * SerfMoveReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -44,7 +44,7 @@ serf_bucket_t * SerfMoveReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
serf_bucket_t
*
req_bkt
=
serf_request_bucket_request_create
(
inSerfRequest
,
"MOVE"
,
"MOVE"
,
getPathStr
(),
getPathStr
(),
0
,
nullptr
,
serf_request_get_alloc
(
inSerfRequest
)
);
serf_request_get_alloc
(
inSerfRequest
)
);
// set request header fields
// set request header fields
...
...
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -69,8 +69,8 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -69,8 +69,8 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
// create body bucket
// create body bucket
serf_bucket_t
*
body_bkt
=
0
;
serf_bucket_t
*
body_bkt
=
nullptr
;
if
(
mpPostData
!=
0
&&
mnPostDataLen
>
0
)
if
(
mpPostData
!=
nullptr
&&
mnPostDataLen
>
0
)
{
{
body_bkt
=
SERF_BUCKET_SIMPLE_STRING_LEN
(
mpPostData
,
mnPostDataLen
,
pSerfBucketAlloc
);
body_bkt
=
SERF_BUCKET_SIMPLE_STRING_LEN
(
mpPostData
,
mnPostDataLen
,
pSerfBucketAlloc
);
}
}
...
@@ -90,11 +90,11 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
...
@@ -90,11 +90,11 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i
handleChunkedEncoding
(
req_bkt
,
mnPostDataLen
);
handleChunkedEncoding
(
req_bkt
,
mnPostDataLen
);
// request specific header fields
// request specific header fields
if
(
mpContentType
!=
0
)
if
(
mpContentType
!=
nullptr
)
{
{
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
mpContentType
);
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
mpContentType
);
}
}
if
(
mpReferer
!=
0
)
if
(
mpReferer
!=
nullptr
)
{
{
serf_bucket_headers_set
(
hdrs_bkt
,
"Referer"
,
mpReferer
);
serf_bucket_headers_set
(
hdrs_bkt
,
"Referer"
,
mpReferer
);
}
}
...
...
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -36,10 +36,10 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
...
@@ -36,10 +36,10 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
const
std
::
vector
<
OUString
>
&
inPropNames
,
const
std
::
vector
<
OUString
>
&
inPropNames
,
std
::
vector
<
DAVResource
>
&
ioResources
)
std
::
vector
<
DAVResource
>
&
ioResources
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
,
mDepthStr
(
0
)
,
mDepthStr
(
nullptr
)
,
mpPropNames
(
&
inPropNames
)
,
mpPropNames
(
&
inPropNames
)
,
mpResources
(
&
ioResources
)
,
mpResources
(
&
ioResources
)
,
mpResInfo
(
0
)
,
mpResInfo
(
nullptr
)
,
mbOnlyPropertyNames
(
false
)
,
mbOnlyPropertyNames
(
false
)
,
xInputStream
(
new
SerfInputStream
()
)
,
xInputStream
(
new
SerfInputStream
()
)
{
{
...
@@ -51,9 +51,9 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
...
@@ -51,9 +51,9 @@ SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath,
const
Depth
inDepth
,
const
Depth
inDepth
,
std
::
vector
<
DAVResourceInfo
>
&
ioResInfo
)
std
::
vector
<
DAVResourceInfo
>
&
ioResInfo
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
:
SerfRequestProcessorImpl
(
inPath
,
inRequestHeaders
)
,
mDepthStr
(
0
)
,
mDepthStr
(
nullptr
)
,
mpPropNames
(
0
)
,
mpPropNames
(
nullptr
)
,
mpResources
(
0
)
,
mpResources
(
nullptr
)
,
mpResInfo
(
&
ioResInfo
)
,
mpResInfo
(
&
ioResInfo
)
,
mbOnlyPropertyNames
(
true
)
,
mbOnlyPropertyNames
(
true
)
,
xInputStream
(
new
SerfInputStream
()
)
,
xInputStream
(
new
SerfInputStream
()
)
...
@@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
...
@@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
// body bucket - certain properties OR all properties OR only property names
// body bucket - certain properties OR all properties OR only property names
serf_bucket_t
*
body_bkt
=
0
;
serf_bucket_t
*
body_bkt
=
nullptr
;
OString
aBodyText
;
OString
aBodyText
;
{
{
OStringBuffer
aBuffer
;
OStringBuffer
aBuffer
;
...
@@ -148,14 +148,14 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
...
@@ -148,14 +148,14 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
// set request header fields
// set request header fields
serf_bucket_t
*
hdrs_bkt
=
serf_bucket_request_get_headers
(
req_bkt
);
serf_bucket_t
*
hdrs_bkt
=
serf_bucket_request_get_headers
(
req_bkt
);
if
(
hdrs_bkt
!=
NULL
)
if
(
hdrs_bkt
!=
nullptr
)
{
{
// general header fields provided by caller
// general header fields provided by caller
setRequestHeaders
(
hdrs_bkt
);
setRequestHeaders
(
hdrs_bkt
);
// request specific header fields
// request specific header fields
serf_bucket_headers_set
(
hdrs_bkt
,
"Depth"
,
mDepthStr
);
serf_bucket_headers_set
(
hdrs_bkt
,
"Depth"
,
mDepthStr
);
if
(
hdrs_bkt
!=
NULL
&&
body_bkt
!=
0
&&
aBodyText
.
getLength
()
>
0
)
if
(
hdrs_bkt
!=
nullptr
&&
body_bkt
!=
nullptr
&&
aBodyText
.
getLength
()
>
0
)
{
{
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
"application/xml"
);
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
"application/xml"
);
}
}
...
...
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -47,7 +47,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
...
@@ -47,7 +47,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
// body bucket
// body bucket
serf_bucket_t
*
body_bkt
=
0
;
serf_bucket_t
*
body_bkt
=
nullptr
;
OString
aBodyText
;
OString
aBodyText
;
{
{
// create and fill body bucket with properties to be set or removed
// create and fill body bucket with properties to be set or removed
...
@@ -60,7 +60,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
...
@@ -60,7 +60,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
{
RTL_CONSTASCII_STRINGPARAM
(
"set"
)
},
{
RTL_CONSTASCII_STRINGPARAM
(
"set"
)
},
{
RTL_CONSTASCII_STRINGPARAM
(
"remove"
)
}
{
RTL_CONSTASCII_STRINGPARAM
(
"remove"
)
}
};
};
const
int
nPropCount
=
(
mpProperties
!=
0
)
const
int
nPropCount
=
(
mpProperties
!=
nullptr
)
?
mpProperties
->
size
()
?
mpProperties
->
size
()
:
0
;
:
0
;
if
(
nPropCount
>
0
)
if
(
nPropCount
>
0
)
...
@@ -154,13 +154,13 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
...
@@ -154,13 +154,13 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
// set request header fields
// set request header fields
serf_bucket_t
*
hdrs_bkt
=
serf_bucket_request_get_headers
(
req_bkt
);
serf_bucket_t
*
hdrs_bkt
=
serf_bucket_request_get_headers
(
req_bkt
);
if
(
hdrs_bkt
!=
NULL
)
if
(
hdrs_bkt
!=
nullptr
)
{
{
// general header fields provided by caller
// general header fields provided by caller
setRequestHeaders
(
hdrs_bkt
);
setRequestHeaders
(
hdrs_bkt
);
// request specific header fields
// request specific header fields
if
(
body_bkt
!=
0
&&
aBodyText
.
getLength
()
>
0
)
if
(
body_bkt
!=
nullptr
&&
aBodyText
.
getLength
()
>
0
)
{
{
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
"application/xml"
);
serf_bucket_headers_set
(
hdrs_bkt
,
"Content-Type"
,
"application/xml"
);
}
}
...
...
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -47,8 +47,8 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in
...
@@ -47,8 +47,8 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
serf_bucket_alloc_t
*
pSerfBucketAlloc
=
serf_request_get_alloc
(
inSerfRequest
);
// create body bucket
// create body bucket
serf_bucket_t
*
body_bkt
=
0
;
serf_bucket_t
*
body_bkt
=
nullptr
;
if
(
mpData
!=
0
&&
mnDataLen
>
0
)
if
(
mpData
!=
nullptr
&&
mnDataLen
>
0
)
{
{
body_bkt
=
SERF_BUCKET_SIMPLE_STRING_LEN
(
mpData
,
mnDataLen
,
pSerfBucketAlloc
);
body_bkt
=
SERF_BUCKET_SIMPLE_STRING_LEN
(
mpData
,
mnDataLen
,
pSerfBucketAlloc
);
}
}
...
...
ucb/source/ucp/webdav/SerfRequestProcessor.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -44,12 +44,12 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession,
...
@@ -44,12 +44,12 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession,
const
OUString
&
inPath
,
const
OUString
&
inPath
,
const
bool
bUseChunkedEncoding
)
const
bool
bUseChunkedEncoding
)
:
mrSerfSession
(
rSerfSession
)
:
mrSerfSession
(
rSerfSession
)
,
mPathStr
(
0
)
,
mPathStr
(
nullptr
)
,
mbUseChunkedEncoding
(
bUseChunkedEncoding
)
,
mbUseChunkedEncoding
(
bUseChunkedEncoding
)
,
mDestPathStr
(
0
)
,
mDestPathStr
(
nullptr
)
,
mContentType
(
0
)
,
mContentType
(
nullptr
)
,
mReferer
(
0
)
,
mReferer
(
nullptr
)
,
mpProcImpl
(
0
)
,
mpProcImpl
(
nullptr
)
,
mbProcessingDone
(
false
)
,
mbProcessingDone
(
false
)
,
mpDAVException
()
,
mpDAVException
()
,
mnHTTPStatusCode
(
SC_NONE
)
,
mnHTTPStatusCode
(
SC_NONE
)
...
@@ -74,7 +74,7 @@ SerfRequestProcessor::~SerfRequestProcessor()
...
@@ -74,7 +74,7 @@ SerfRequestProcessor::~SerfRequestProcessor()
void
SerfRequestProcessor
::
prepareProcessor
()
void
SerfRequestProcessor
::
prepareProcessor
()
{
{
delete
mpDAVException
;
delete
mpDAVException
;
mpDAVException
=
0
;
mpDAVException
=
nullptr
;
mnHTTPStatusCode
=
SC_NONE
;
mnHTTPStatusCode
=
SC_NONE
;
mHTTPStatusCodeText
.
clear
();
mHTTPStatusCodeText
.
clear
();
mRedirectLocation
.
clear
();
mRedirectLocation
.
clear
();
...
...
ucb/source/ucp/webdav/SerfRequestProcessor.hxx
Dosyayı görüntüle @
54a7c24e
...
@@ -126,7 +126,7 @@ public:
...
@@ -126,7 +126,7 @@ public:
apr_status_t
&
outSerfStatus
);
apr_status_t
&
outSerfStatus
);
//LOCK
//LOCK
bool
processLock
(
const
css
::
ucb
::
Lock
&
rLock
,
sal_Int32
*
plastChanceToSendRefreshRequest
=
0
);
bool
processLock
(
const
css
::
ucb
::
Lock
&
rLock
,
sal_Int32
*
plastChanceToSendRefreshRequest
=
nullptr
);
//UNLOCK
//UNLOCK
bool
processUnlock
();
bool
processUnlock
();
...
...
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -62,7 +62,7 @@ void SerfRequestProcessorImpl::handleChunkedEncoding (
...
@@ -62,7 +62,7 @@ void SerfRequestProcessorImpl::handleChunkedEncoding (
serf_bucket_t
*
pRequestBucket
,
serf_bucket_t
*
pRequestBucket
,
apr_int64_t
nLength
)
const
apr_int64_t
nLength
)
const
{
{
if
(
pRequestBucket
!=
NULL
)
if
(
pRequestBucket
!=
nullptr
)
{
{
if
(
useChunkedEncoding
())
if
(
useChunkedEncoding
())
{
{
...
...
ucb/source/ucp/webdav/SerfSession.cxx
Dosyayı görüntüle @
54a7c24e
...
@@ -64,8 +64,8 @@ SerfSession::SerfSession(
...
@@ -64,8 +64,8 @@ SerfSession::SerfSession(
,
m_aUri
(
inUri
)
,
m_aUri
(
inUri
)
,
m_aProxyName
()
,
m_aProxyName
()
,
m_nProxyPort
(
0
)
,
m_nProxyPort
(
0
)
,
m_pSerfConnection
(
0
)
,
m_pSerfConnection
(
nullptr
)
,
m_pSerfContext
(
0
)
,
m_pSerfContext
(
nullptr
)
,
m_bIsHeadRequestInProgress
(
false
)
,
m_bIsHeadRequestInProgress
(
false
)
,
m_bUseChunkedEncoding
(
false
)
,
m_bUseChunkedEncoding
(
false
)
,
m_bNoOfTransferEncodingSwitches
(
0
)
,
m_bNoOfTransferEncodingSwitches
(
0
)
...
@@ -74,7 +74,7 @@ SerfSession::SerfSession(
...
@@ -74,7 +74,7 @@ SerfSession::SerfSession(
{
{
m_pSerfContext
=
serf_context_create
(
getAprPool
()
);
m_pSerfContext
=
serf_context_create
(
getAprPool
()
);
m_pSerfBucket_Alloc
=
serf_bucket_allocator_create
(
getAprPool
(),
NULL
,
NULL
);
m_pSerfBucket_Alloc
=
serf_bucket_allocator_create
(
getAprPool
(),
nullptr
,
nullptr
);
}
}
...
@@ -85,7 +85,7 @@ SerfSession::~SerfSession( )
...
@@ -85,7 +85,7 @@ SerfSession::~SerfSession( )
if
(
m_pSerfConnection
)
if
(
m_pSerfConnection
)
{
{
serf_connection_close
(
m_pSerfConnection
);
serf_connection_close
(
m_pSerfConnection
);
m_pSerfConnection
=
0
;
m_pSerfConnection
=
nullptr
;
}
}
}
}
...
@@ -106,7 +106,7 @@ void SerfSession::Init()
...
@@ -106,7 +106,7 @@ void SerfSession::Init()
bool
bCreateNewSession
=
false
;
bool
bCreateNewSession
=
false
;
if
(
m_pSerfConnection
==
0
)
if
(
m_pSerfConnection
==
nullptr
)
{
{
const
ucbhelper
::
InternetProxyServer
&
rProxyCfg
=
getProxySettings
();
const
ucbhelper
::
InternetProxyServer
&
rProxyCfg
=
getProxySettings
();
...
@@ -128,7 +128,7 @@ void SerfSession::Init()
...
@@ -128,7 +128,7 @@ void SerfSession::Init()
// new session needed, destroy old first
// new session needed, destroy old first
serf_connection_close
(
m_pSerfConnection
);
serf_connection_close
(
m_pSerfConnection
);
m_pSerfConnection
=
0
;
m_pSerfConnection
=
nullptr
;
bCreateNewSession
=
true
;
bCreateNewSession
=
true
;
}
}
}
}
...
@@ -140,10 +140,10 @@ void SerfSession::Init()
...
@@ -140,10 +140,10 @@ void SerfSession::Init()
m_pSerfContext
,
m_pSerfContext
,
m_aUri
.
getAprUri
(),
m_aUri
.
getAprUri
(),
Serf_ConnectSetup
,
this
,
Serf_ConnectSetup
,
this
,
0
/* close connection callback */
,
0
/* close connection baton */
,
nullptr
/* close connection callback */
,
nullptr
/* close connection baton */
,
getAprPool
()
);
getAprPool
()
);
if
(
m_pSerfConnection
==
0
||
status
!=
APR_SUCCESS
)
if
(
m_pSerfConnection
==
nullptr
||
status
!=
APR_SUCCESS
)
{
{
throw
DAVException
(
DAVException
::
DAV_SESSION_CREATE
,
throw
DAVException
(
DAVException
::
DAV_SESSION_CREATE
,
SerfUri
::
makeConnectionEndPointString
(
m_aUri
.
GetHost
(),
m_aUri
.
GetPort
()
)
);
SerfUri
::
makeConnectionEndPointString
(
m_aUri
.
GetHost
(),
m_aUri
.
GetPort
()
)
);
...
@@ -154,7 +154,7 @@ void SerfSession::Init()
...
@@ -154,7 +154,7 @@ void SerfSession::Init()
if
(
m_aProxyName
.
getLength
()
)
if
(
m_aProxyName
.
getLength
()
)
{
{
apr_sockaddr_t
*
proxy_address
=
NULL
;
apr_sockaddr_t
*
proxy_address
=
nullptr
;
status
=
apr_sockaddr_info_get
(
&
proxy_address
,
status
=
apr_sockaddr_info_get
(
&
proxy_address
,
OUStringToOString
(
m_aProxyName
,
RTL_TEXTENCODING_UTF8
).
getStr
(),
OUStringToOString
(
m_aProxyName
,
RTL_TEXTENCODING_UTF8
).
getStr
(),
APR_UNSPEC
,
APR_UNSPEC
,
...
@@ -254,14 +254,14 @@ apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket,
...
@@ -254,14 +254,14 @@ apr_status_t SerfSession::setupSerfConnection( apr_socket_t * inAprSocket,
if
(
isSSLNeeded
()
)
if
(
isSSLNeeded
()
)
{
{
tmpInputBkt
=
serf_bucket_ssl_decrypt_create
(
tmpInputBkt
,
tmpInputBkt
=
serf_bucket_ssl_decrypt_create
(
tmpInputBkt
,
0
,
nullptr
,
getSerfBktAlloc
()
);
getSerfBktAlloc
()
);
/** Set the callback that is called to authenticate the
/** Set the callback that is called to authenticate the
certificate (chain).
certificate (chain).
*/
*/
serf_ssl_server_cert_chain_callback_set
(
serf_ssl_server_cert_chain_callback_set
(
serf_bucket_ssl_decrypt_context_get
(
tmpInputBkt
),
serf_bucket_ssl_decrypt_context_get
(
tmpInputBkt
),
NULL
,
nullptr
,
Serf_CertificateChainValidation
,
Serf_CertificateChainValidation
,
this
);
this
);
serf_ssl_set_hostname
(
serf_bucket_ssl_decrypt_context_get
(
tmpInputBkt
),
serf_ssl_set_hostname
(
serf_bucket_ssl_decrypt_context_get
(
tmpInputBkt
),
...
@@ -344,9 +344,9 @@ apr_status_t SerfSession::verifySerfCertificateChain (
...
@@ -344,9 +344,9 @@ apr_status_t SerfSession::verifySerfCertificateChain (
int
nCertificateChainLength
)
int
nCertificateChainLength
)
{
{
// Check arguments.
// Check arguments.
if
(
pCertificateChainBase64Encoded
==
NULL
||
nCertificateChainLength
<=
0
)
if
(
pCertificateChainBase64Encoded
==
nullptr
||
nCertificateChainLength
<=
0
)
{
{
assert
(
pCertificateChainBase64Encoded
!=
NULL
);
assert
(
pCertificateChainBase64Encoded
!=
nullptr
);
assert
(
nCertificateChainLength
>
0
);
assert
(
nCertificateChainLength
>
0
);
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
return
SERF_SSL_CERT_UNKNOWN_FAILURE
;
}
}
...
@@ -611,7 +611,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
...
@@ -611,7 +611,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
status
);
status
);
if
(
status
==
APR_SUCCESS
&&
if
(
status
==
APR_SUCCESS
&&
aReqProc
->
mpDAVException
==
0
&&
aReqProc
->
mpDAVException
==
nullptr
&&
ioResources
.
empty
()
)
ioResources
.
empty
()
)
{
{
m_aEnv
=
DAVRequestEnvironment
();
m_aEnv
=
DAVRequestEnvironment
();
...
@@ -640,7 +640,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
...
@@ -640,7 +640,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
status
);
status
);
if
(
status
==
APR_SUCCESS
&&
if
(
status
==
APR_SUCCESS
&&
aReqProc
->
mpDAVException
==
0
&&
aReqProc
->
mpDAVException
==
nullptr
&&
ioResInfo
.
empty
()
)
ioResInfo
.
empty
()
)
{
{
m_aEnv
=
DAVRequestEnvironment
();
m_aEnv
=
DAVRequestEnvironment
();
...
...
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