Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: Source/WebCore/platform/network/HTTPParsers.h

Issue 9309049: Merge 106514 - contentDispositionType misparses the Content-Disposition header in some obscure co... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/platform/network/HTTPParsers.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 2 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 }; 43 };
44 44
45 typedef enum { 45 typedef enum {
46 ContentDispositionNone, 46 ContentDispositionNone,
47 ContentDispositionInline, 47 ContentDispositionInline,
48 ContentDispositionAttachment, 48 ContentDispositionAttachment,
49 ContentDispositionOther 49 ContentDispositionOther
50 } ContentDispositionType; 50 } ContentDispositionType;
51 51
52 ContentDispositionType contentDispositionType(const String&); 52 ContentDispositionType contentDispositionType(const String&);
53 bool isRFC2616Token(const String&);
53 bool parseHTTPRefresh(const String& refresh, bool fromHttpEquivMeta, double& del ay, String& url); 54 bool parseHTTPRefresh(const String& refresh, bool fromHttpEquivMeta, double& del ay, String& url);
54 double parseDate(const String&); 55 double parseDate(const String&);
55 String filenameFromHTTPContentDisposition(const String&); 56 String filenameFromHTTPContentDisposition(const String&);
56 String extractMIMETypeFromMediaType(const String&); 57 String extractMIMETypeFromMediaType(const String&);
57 String extractCharsetFromMediaType(const String&); 58 String extractCharsetFromMediaType(const String&);
58 void findCharsetInMediaType(const String& mediaType, unsigned int& charsetPos, u nsigned int& charsetLen, unsigned int start = 0); 59 void findCharsetInMediaType(const String& mediaType, unsigned int& charsetPos, u nsigned int& charsetLen, unsigned int start = 0);
59 XSSProtectionDisposition parseXSSProtectionHeader(const String&); 60 XSSProtectionDisposition parseXSSProtectionHeader(const String&);
60 String extractReasonPhraseFromHTTPStatusLine(const String&); 61 String extractReasonPhraseFromHTTPStatusLine(const String&);
61 62
62 // -1 could be set to one of the return parameters to indicate the value is not specified. 63 // -1 could be set to one of the return parameters to indicate the value is not specified.
63 bool parseRange(const String&, long long& rangeOffset, long long& rangeEnd, long long& rangeSuffixLength); 64 bool parseRange(const String&, long long& rangeOffset, long long& rangeEnd, long long& rangeSuffixLength);
64 65
65 } 66 }
66 67
67 #endif 68 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/platform/network/HTTPParsers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698