| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 #if USE(SOUP) | 49 #if USE(SOUP) |
| 50 #define LIBSOUP_USE_UNSTABLE_REQUEST_API | 50 #define LIBSOUP_USE_UNSTABLE_REQUEST_API |
| 51 #include <libsoup/soup-multipart-input-stream.h> | 51 #include <libsoup/soup-multipart-input-stream.h> |
| 52 #include <libsoup/soup-request.h> | 52 #include <libsoup/soup-request.h> |
| 53 #include <libsoup/soup.h> | 53 #include <libsoup/soup.h> |
| 54 #include <wtf/gobject/GRefPtr.h> | 54 #include <wtf/gobject/GRefPtr.h> |
| 55 class Frame; | 55 class Frame; |
| 56 #endif | 56 #endif |
| 57 | 57 |
| 58 #if PLATFORM(QT) | |
| 59 QT_BEGIN_NAMESPACE | |
| 60 class QWebNetworkJob; | |
| 61 QT_END_NAMESPACE | |
| 62 namespace WebCore { | |
| 63 class QNetworkReplyHandler; | |
| 64 } | |
| 65 #endif | |
| 66 | |
| 67 #if PLATFORM(MAC) | 58 #if PLATFORM(MAC) |
| 68 OBJC_CLASS NSURLAuthenticationChallenge; | 59 OBJC_CLASS NSURLAuthenticationChallenge; |
| 69 OBJC_CLASS NSURLConnection; | 60 OBJC_CLASS NSURLConnection; |
| 70 #endif | 61 #endif |
| 71 | 62 |
| 72 #if PLATFORM(MAC) || USE(CFNETWORK) | 63 #if PLATFORM(MAC) || USE(CFNETWORK) |
| 73 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef; | 64 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef; |
| 74 #endif | 65 #endif |
| 75 | 66 |
| 76 // The allocations and releases in ResourceHandleInternal are | 67 // The allocations and releases in ResourceHandleInternal are |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 , m_formDataStream(loader) | 103 , m_formDataStream(loader) |
| 113 #endif | 104 #endif |
| 114 #if USE(SOUP) | 105 #if USE(SOUP) |
| 115 , m_cancelled(false) | 106 , m_cancelled(false) |
| 116 , m_buffer(0) | 107 , m_buffer(0) |
| 117 , m_bufferSize(0) | 108 , m_bufferSize(0) |
| 118 , m_bodySize(0) | 109 , m_bodySize(0) |
| 119 , m_bodyDataSent(0) | 110 , m_bodyDataSent(0) |
| 120 , m_redirectCount(0) | 111 , m_redirectCount(0) |
| 121 #endif | 112 #endif |
| 122 #if PLATFORM(QT) | |
| 123 , m_job(0) | |
| 124 #endif | |
| 125 #if PLATFORM(MAC) | 113 #if PLATFORM(MAC) |
| 126 , m_startWhenScheduled(false) | 114 , m_startWhenScheduled(false) |
| 127 , m_needsSiteSpecificQuirks(false) | 115 , m_needsSiteSpecificQuirks(false) |
| 128 , m_currentMacChallenge(nil) | 116 , m_currentMacChallenge(nil) |
| 129 #endif | 117 #endif |
| 130 , m_scheduledFailureType(ResourceHandle::NoFailure) | 118 , m_scheduledFailureType(ResourceHandle::NoFailure) |
| 131 , m_failureTimer(loader, &ResourceHandle::fireFailure) | 119 , m_failureTimer(loader, &ResourceHandle::fireFailure) |
| 132 { | 120 { |
| 133 const KURL& url = m_firstRequest.url(); | 121 const KURL& url = m_firstRequest.url(); |
| 134 m_user = url.user(); | 122 m_user = url.user(); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 GRefPtr<GCancellable> m_cancellable; | 189 GRefPtr<GCancellable> m_cancellable; |
| 202 GRefPtr<GAsyncResult> m_deferredResult; | 190 GRefPtr<GAsyncResult> m_deferredResult; |
| 203 GRefPtr<GSource> m_timeoutSource; | 191 GRefPtr<GSource> m_timeoutSource; |
| 204 char* m_buffer; | 192 char* m_buffer; |
| 205 int m_bufferSize; | 193 int m_bufferSize; |
| 206 unsigned long m_bodySize; | 194 unsigned long m_bodySize; |
| 207 unsigned long m_bodyDataSent; | 195 unsigned long m_bodyDataSent; |
| 208 SoupSession* soupSession(); | 196 SoupSession* soupSession(); |
| 209 int m_redirectCount; | 197 int m_redirectCount; |
| 210 #endif | 198 #endif |
| 211 #if PLATFORM(GTK) | |
| 212 struct { | |
| 213 Credential credential; | |
| 214 AuthenticationChallenge challenge; | |
| 215 } m_credentialDataToSaveInPersistentStore; | |
| 216 #endif | |
| 217 #if PLATFORM(QT) | |
| 218 QNetworkReplyHandler* m_job; | |
| 219 #endif | |
| 220 | |
| 221 #if PLATFORM(MAC) | 199 #if PLATFORM(MAC) |
| 222 // We need to keep a reference to the original challenge to be able to c
ancel it. | 200 // We need to keep a reference to the original challenge to be able to c
ancel it. |
| 223 // It is almost identical to m_currentWebChallenge.nsURLAuthenticationCh
allenge(), but has a different sender. | 201 // It is almost identical to m_currentWebChallenge.nsURLAuthenticationCh
allenge(), but has a different sender. |
| 224 NSURLAuthenticationChallenge *m_currentMacChallenge; | 202 NSURLAuthenticationChallenge *m_currentMacChallenge; |
| 225 #endif | 203 #endif |
| 226 AuthenticationChallenge m_currentWebChallenge; | 204 AuthenticationChallenge m_currentWebChallenge; |
| 227 #if PLATFORM(BLACKBERRY) | 205 #if PLATFORM(BLACKBERRY) |
| 228 // We need to store the credentials for host and proxy separately for th
e platform | 206 // We need to store the credentials for host and proxy separately for th
e platform |
| 229 // networking layer. One of these will always be equal to m_currentWebCh
allenge. | 207 // networking layer. One of these will always be equal to m_currentWebCh
allenge. |
| 230 AuthenticationChallenge m_hostWebChallenge; | 208 AuthenticationChallenge m_hostWebChallenge; |
| 231 AuthenticationChallenge m_proxyWebChallenge; | 209 AuthenticationChallenge m_proxyWebChallenge; |
| 232 #endif | 210 #endif |
| 233 | 211 |
| 234 ResourceHandle::FailureType m_scheduledFailureType; | 212 ResourceHandle::FailureType m_scheduledFailureType; |
| 235 Timer<ResourceHandle> m_failureTimer; | 213 Timer<ResourceHandle> m_failureTimer; |
| 236 }; | 214 }; |
| 237 | 215 |
| 238 } // namespace WebCore | 216 } // namespace WebCore |
| 239 | 217 |
| 240 #endif // ResourceHandleInternal_h | 218 #endif // ResourceHandleInternal_h |
| OLD | NEW |