Jeff Kaufman
07286005a6
Changes:
* r3585: With downstream caching, don't touch `Cache-Control` headers.
* No longer require `Modify Caching Headers off`.
* Change from `modify_caching_headers` as a boolean to a three valued enum
`PreserveCachingHeaders`.
* r3596: Make tests less flaky.
* Changes WGET_DUMP to write to WGET_DIR instead of OUTDIR.
* r3597: Remove now-redundant system tests.
* Some system tests were moved into `automatic/system_test.sh` which means we
can remove our forks.
* r3598: Enable the shared memory metadata cache by default.
* The code change just worked and needed no changes, but it also added
substantial tests, which needed some porting.
* Deflake the `scrape stats` test by moving it before config reloading.
123 lines
3.5 KiB
C++
123 lines
3.5 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
// Author: jefftk@google.com (Jeff Kaufman)
|
|
|
|
#ifndef NGX_PAGESPEED_H_
|
|
#define NGX_PAGESPEED_H_
|
|
|
|
// We might be compiled with syslog.h, which #defines LOG_INFO and LOG_WARNING
|
|
// as ints. But logging.h assumes they're usable as names, within their
|
|
// namespace, so we need to #undef them before including logging.h
|
|
#ifdef LOG_INFO
|
|
#undef LOG_INFO
|
|
#endif
|
|
#ifdef LOG_WARNING
|
|
#undef LOG_WARNING
|
|
#endif
|
|
|
|
extern "C" {
|
|
#include <ngx_http.h>
|
|
}
|
|
|
|
#include "base/logging.h"
|
|
#include "net/instaweb/http/public/response_headers.h"
|
|
#include "net/instaweb/util/public/string_util.h"
|
|
|
|
namespace net_instaweb {
|
|
|
|
class GzipInflater;
|
|
class NgxBaseFetch;
|
|
class ProxyFetch;
|
|
class RewriteDriver;
|
|
class RequestHeaders;
|
|
class ResponseHeaders;
|
|
class InPlaceResourceRecorder;
|
|
|
|
// Allocate chain links and buffers from the supplied pool, and copy over the
|
|
// data from the string piece. If the string piece is empty, return
|
|
// NGX_DECLINED immediately unless send_last_buf.
|
|
ngx_int_t string_piece_to_buffer_chain(
|
|
ngx_pool_t* pool, StringPiece sp,
|
|
ngx_chain_t** link_ptr, bool send_last_buf);
|
|
|
|
StringPiece str_to_string_piece(ngx_str_t s);
|
|
|
|
// s1: ngx_str_t, s2: string literal
|
|
// true if they're equal, false otherwise
|
|
#define STR_EQ_LITERAL(s1, s2) \
|
|
((s1).len == (sizeof(s2)-1) && \
|
|
ngx_strncmp((s1).data, (s2), (sizeof(s2)-1)) == 0)
|
|
|
|
// s1: ngx_str_t, s2: string literal
|
|
// true if they're equal ignoring case, false otherwise
|
|
#define STR_CASE_EQ_LITERAL(s1, s2) \
|
|
((s1).len == (sizeof(s2)-1) && \
|
|
ngx_strncasecmp((s1).data, ( \
|
|
reinterpret_cast<u_char*>( \
|
|
const_cast<char*>(s2))), \
|
|
(sizeof(s2)-1)) == 0)
|
|
|
|
// Allocate memory out of the pool for the string piece, and copy the contents
|
|
// over. Returns NULL if we can't get memory.
|
|
char* string_piece_to_pool_string(ngx_pool_t* pool, StringPiece sp);
|
|
|
|
enum PreserveCachingHeaders {
|
|
kPreserveAllCachingHeaders, // Cache-Control, ETag, Last-Modified, etc
|
|
kPreserveOnlyCacheControl, // Only Cache-Control.
|
|
kDontPreserveHeaders,
|
|
};
|
|
|
|
typedef struct {
|
|
NgxBaseFetch* base_fetch;
|
|
|
|
ngx_connection_t* pagespeed_connection;
|
|
ngx_http_request_t* r;
|
|
|
|
bool html_rewrite;
|
|
bool in_place;
|
|
|
|
bool write_pending;
|
|
bool fetch_done;
|
|
|
|
PreserveCachingHeaders preserve_caching_headers;
|
|
|
|
// for html rewrite
|
|
ProxyFetch* proxy_fetch;
|
|
GzipInflater* inflater_;
|
|
|
|
// for in place resource
|
|
RewriteDriver* driver;
|
|
InPlaceResourceRecorder* recorder;
|
|
ResponseHeaders* ipro_response_headers;
|
|
} ps_request_ctx_t;
|
|
|
|
|
|
void copy_request_headers_from_ngx(const ngx_http_request_t* r,
|
|
RequestHeaders* headers);
|
|
|
|
void copy_response_headers_from_ngx(const ngx_http_request_t* r,
|
|
ResponseHeaders* headers);
|
|
|
|
ngx_int_t copy_response_headers_to_ngx(
|
|
ngx_http_request_t* r,
|
|
const ResponseHeaders& pagespeed_headers,
|
|
PreserveCachingHeaders preserve_caching_headers);
|
|
|
|
} // namespace net_instaweb
|
|
|
|
#endif // NGX_PAGESPEED_H_
|