| SerfSession.cxx (10e20387) | SerfSession.cxx (fdf35928) |
|---|---|
| 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 148 unchanged lines hidden (view full) --- 157 } 158 159 // Register the session with the lock store 160// m_aSerfLockStore.registerSession( m_pSerfConnection ); 161 162 if ( m_aProxyName.getLength() ) 163 { 164 apr_sockaddr_t *proxy_address = NULL; | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 148 unchanged lines hidden (view full) --- 157 } 158 159 // Register the session with the lock store 160// m_aSerfLockStore.registerSession( m_pSerfConnection ); 161 162 if ( m_aProxyName.getLength() ) 163 { 164 apr_sockaddr_t *proxy_address = NULL; |
| 165 const apr_status_t status = apr_sockaddr_info_get( &proxy_address, | 165 status = apr_sockaddr_info_get( &proxy_address, |
| 166 rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), 167 APR_UNSPEC, 168 static_cast<apr_port_t>(m_nProxyPort), 169 0, getAprPool() ); 170 171 if ( status != APR_SUCCESS ) 172 { 173 throw DAVException( DAVException::DAV_SESSION_CREATE, --- 281 unchanged lines hidden (view full) --- 455 ? APR_SUCCESS 456 : SERF_SSL_CERT_UNKNOWN_FAILURE; 457 } 458 459 // The shortcut failed, so try to verify the whole chain. This is 460 // done outside the isDomainMatch() block because the result is 461 // used by the interaction handler. 462 std::vector< uno::Reference< security::XCertificate > > aChain; | 166 rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), 167 APR_UNSPEC, 168 static_cast<apr_port_t>(m_nProxyPort), 169 0, getAprPool() ); 170 171 if ( status != APR_SUCCESS ) 172 { 173 throw DAVException( DAVException::DAV_SESSION_CREATE, --- 281 unchanged lines hidden (view full) --- 455 ? APR_SUCCESS 456 : SERF_SSL_CERT_UNKNOWN_FAILURE; 457 } 458 459 // The shortcut failed, so try to verify the whole chain. This is 460 // done outside the isDomainMatch() block because the result is 461 // used by the interaction handler. 462 std::vector< uno::Reference< security::XCertificate > > aChain; |
| 463 for (int nIndex=1; nIndex<nCertificateChainLength; ++nIndex) | 463 for (nIndex=1; nIndex<nCertificateChainLength; ++nIndex) |
| 464 { 465 const char* sBase64EncodedCertificate ( 466 serf_ssl_cert_export( 467 pCertificateChainBase64Encoded[nIndex], 468 getAprPool())); 469 uno::Reference< security::XCertificate > xCertificate( 470 xSecurityEnv->createCertificateFromAscii( 471 rtl::OUString::createFromAscii(sBase64EncodedCertificate))); --- 1141 unchanged lines hidden --- | 464 { 465 const char* sBase64EncodedCertificate ( 466 serf_ssl_cert_export( 467 pCertificateChainBase64Encoded[nIndex], 468 getAprPool())); 469 uno::Reference< security::XCertificate > xCertificate( 470 xSecurityEnv->createCertificateFromAscii( 471 rtl::OUString::createFromAscii(sBase64EncodedCertificate))); --- 1141 unchanged lines hidden --- |