artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from pagespeed/jefftk-deferjs-system-test

Browse Source 
content handler: support static javascript requests
This commit is contained in:
Jeff Kaufman
2012-11-20 08:00:46 -08:00
parent 0680b81028 72b1b98bb9
commit 6071062407
6 changed files with 288 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_base_fetch.cc
+6 -79
View File
@@ -94,92 +94,19 @@ bool NgxBaseFetch::HandleWrite(const StringPiece& sp,
}
ngx_int_t NgxBaseFetch::CopyBufferToNginx(ngx_chain_t** link_ptr) {
if ((last_buf_sent_ || !done_called_) && buffer_.length() == 0) {
// Nothing to send. But if done_called_ then we can't short circuit because
// we need to set last_buf unless last_buf_sent_.
return NGX_DECLINED;
}
// TODO(jefftk): if done_called_ && last_buf_sent_, should we just short
// circuit (return NGX_OK) here?
// Below, *link_ptr will be NULL if we're starting the chain, and the head
// chain link.
*link_ptr = NULL;
// If non-null, the current last link in the chain.
ngx_chain_t* tail_link = NULL;
// How far into buffer_ we're currently working on.
ngx_uint_t offset;
// TODO(jefftk): look up the nginx buffer size properly.
ngx_uint_t max_buffer_size = 8192; // 8k
for (offset = 0 ;
offset < buffer_.length() ||
// If the pagespeed buffer is empty but Done() has been called we
// need to pass through an empty buffer to nginx to communicate
// last_buf. Otherwise we shouldn't generate empty buffers.
(offset == 0 && buffer_.length() == 0);
offset += max_buffer_size) {
// Prepare a new nginx buffer to put our buffered writes into.
ngx_buf_t* b = static_cast<ngx_buf_t*>(ngx_calloc_buf(request_->pool));
if (b == NULL) {
return NGX_ERROR;
}
if (buffer_.length() == 0) {
CHECK(offset == 0);
b->pos = b->start = b->end = b->last = NULL;
// The purpose of this buffer is just to pass along last_buf.
b->sync = 1;
} else {
CHECK(buffer_.length() > offset);
ngx_uint_t b_size = buffer_.length() - offset;
if (b_size > max_buffer_size) {
b_size = max_buffer_size;
}
b->start = b->pos = static_cast<u_char*>(
ngx_palloc(request_->pool, b_size));
if (b->pos == NULL) {
return NGX_ERROR;
}
// Copy our writes over. We're copying from buffer_[offset] up to
// buffer_[offset + b_size] into b which has size b_size.
buffer_.copy(reinterpret_cast<char*>(b->pos), b_size, offset);
b->last = b->end = b->pos + b_size;
b->temporary = 1; // Identify this buffer as in-memory and mutable.
}
// Prepare a chain link.
ngx_chain_t* cl = static_cast<ngx_chain_t*>(
ngx_alloc_chain_link(request_->pool));
if (cl == NULL) {
return NGX_ERROR;
}
cl->buf = b;
cl->next = NULL;
if (*link_ptr == NULL) {
// This is the first link in the returned chain.
*link_ptr = cl;
} else {
// Link us into the chain.
CHECK(tail_link != NULL);
tail_link->next = cl;
}
tail_link = cl;
int rc = ngx_http_pagespeed_string_piece_to_buffer_chain(
request_->pool, buffer_, link_ptr, done_called_ /* send_last_buf */);
if (rc != NGX_OK) {
return rc;
}
// Done with buffer contents now.
buffer_.clear();
CHECK(tail_link != NULL);
if (done_called_) {
tail_link->buf->last_buf = true;
last_buf_sent_ = true;
}
src/ngx_pagespeed.cc
+230 -44
View File
@@ -42,6 +42,7 @@ extern "C" {
#include "net/instaweb/rewriter/public/furious_matcher.h"
#include "net/instaweb/rewriter/public/process_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/static_javascript_manager.h"
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/public/version.h"
#include "net/instaweb/util/public/google_url.h"
@@ -77,6 +78,97 @@ ngx_http_string_piece_to_pool_string(ngx_pool_t* pool, StringPiece sp) {
return s;
}
ngx_int_t
ngx_http_pagespeed_string_piece_to_buffer_chain(
ngx_pool_t* pool, StringPiece sp, ngx_chain_t** link_ptr,
bool send_last_buf) {
if (!send_last_buf && sp.size() == 0) {
// Nothing to send, not even the metadata that this is the last buffer.
return NGX_DECLINED;
}
// Below, *link_ptr will be NULL if we're starting the chain, and the head
// chain link.
*link_ptr = NULL;
// If non-null, the current last link in the chain.
ngx_chain_t* tail_link = NULL;
// How far into sp we're currently working on.
ngx_uint_t offset;
// TODO(jefftk): look up the nginx buffer size properly.
ngx_uint_t max_buffer_size = 8192; // 8k
for (offset = 0 ;
offset < sp.size() ||
// If we need to send the last buffer bit and there's no data, we
// should send a single empty buffer. Otherwise we shouldn't
// generate empty buffers.
(offset == 0 && sp.size() == 0);
offset += max_buffer_size) {
// Prepare a new nginx buffer to put our buffered writes into.
ngx_buf_t* b = static_cast<ngx_buf_t*>(ngx_calloc_buf(pool));
if (b == NULL) {
return NGX_ERROR;
}
if (sp.size() == 0) {
CHECK(offset == 0);
b->pos = b->start = b->end = b->last = NULL;
// The purpose of this buffer is just to pass along last_buf.
b->sync = 1;
} else {
CHECK(sp.size() > offset);
ngx_uint_t b_size = sp.size() - offset;
if (b_size > max_buffer_size) {
b_size = max_buffer_size;
}
b->start = b->pos = static_cast<u_char*>(ngx_palloc(pool, b_size));
if (b->pos == NULL) {
return NGX_ERROR;
}
// Copy our writes over. We're copying from sp[offset] up to
// sp[offset + b_size] into b which has size b_size.
sp.copy(reinterpret_cast<char*>(b->pos), b_size, offset);
b->last = b->end = b->pos + b_size;
b->temporary = 1; // Identify this buffer as in-memory and mutable.
}
// Prepare a chain link.
ngx_chain_t* cl = static_cast<ngx_chain_t*>(ngx_alloc_chain_link(pool));
if (cl == NULL) {
return NGX_ERROR;
}
cl->buf = b;
cl->next = NULL;
if (*link_ptr == NULL) {
// This is the first link in the returned chain.
*link_ptr = cl;
} else {
// Link us into the chain.
CHECK(tail_link != NULL);
tail_link->next = cl;
}
tail_link = cl;
}
CHECK(tail_link != NULL);
if (send_last_buf) {
tail_link->buf->last_buf = true;
}
return NGX_OK;
}
typedef struct {
net_instaweb::NgxRewriteDriverFactory* driver_factory;
net_instaweb::NgxServerContext* server_context;
@@ -135,7 +227,18 @@ ngx_http_pagespeed_connection_read_handler(ngx_event_t* ev);
ngx_int_t
ngx_http_pagespeed_create_connection(ngx_http_pagespeed_request_ctx_t* ctx);
ngx_int_t
namespace CreateRequestContext {
enum Response {
kOk,
kError,
kNotUnderstood,
kStaticContent,
kInvalidUrl,
kPagespeedDisabled,
};
} // namespace CreateRequestContext
CreateRequestContext::Response
ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
bool is_resource_fetch);
@@ -579,7 +682,7 @@ ngx_http_pagespeed_create_connection(ngx_http_pagespeed_request_ctx_t* ctx) {
}
// Set us up for processing a request.
ngx_int_t
CreateRequestContext::Response
ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
bool is_resource_fetch) {
fprintf(stderr, "ngx_http_pagespeed_create_request_context\n");
@@ -600,32 +703,37 @@ ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
// Let nginx deal with the error however it wants; we will see a NULL ctx in
// the body filter or content handler and do nothing.
return is_resource_fetch ? NGX_DECLINED : NGX_OK;
return CreateRequestContext::kInvalidUrl;
}
if (is_resource_fetch && !cfg->server_context->IsPagespeedResource(url)) {
if (url.PathSansLeaf() ==
net_instaweb::NgxRewriteDriverFactory::kStaticJavaScriptPrefix) {
return CreateRequestContext::kStaticContent;
} else {
DBG(r, "Passing on content handling for non-pagespeed resource '%s'",
url_string.c_str());
return NGX_DECLINED;
return CreateRequestContext::kNotUnderstood;
}
}
int file_descriptors[2];
int rc = pipe(file_descriptors);
if (rc != 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "pipe() failed");
return NGX_ERROR;
return CreateRequestContext::kError;
}
if (ngx_nonblocking(file_descriptors[0]) == -1) {
ngx_log_error(NGX_LOG_EMERG, r->connection->log, ngx_socket_errno,
ngx_nonblocking_n " pipe[0] failed");
return NGX_ERROR;
return CreateRequestContext::kError;
}
if (ngx_nonblocking(file_descriptors[1]) == -1) {
ngx_log_error(NGX_LOG_EMERG, r->connection->log, ngx_socket_errno,
ngx_nonblocking_n " pipe[1] failed");
return NGX_ERROR;
return CreateRequestContext::kError;
}
ngx_http_pagespeed_request_ctx_t* ctx =
@@ -645,7 +753,7 @@ ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
"ngx_http_pagespeed_create_request_context: "
"no pagespeed connection.");
ngx_http_pagespeed_release_request_context(ctx);
return NGX_ERROR;
return CreateRequestContext::kError;
}
// Deletes itself when HandleDone is called, which happens when we call Done()
@@ -671,7 +779,7 @@ ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
"ngx_http_pagespeed_create_request_context: "
"parsing headers or query params failed.");
ngx_http_pagespeed_release_request_context(ctx);
return NGX_ERROR;
return CreateRequestContext::kError;
}
@@ -710,7 +818,7 @@ ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
if ((custom_options && !custom_options->enabled()) ||
(!custom_options && !global_options->enabled())) {
ngx_http_pagespeed_release_request_context(ctx);
return NGX_DECLINED;
return CreateRequestContext::kPagespeedDisabled;
}
// TODO(jefftk): port ProxyInterface::InitiatePropertyCacheLookup so that we
@@ -750,13 +858,13 @@ ngx_http_pagespeed_create_request_context(ngx_http_request_t* r,
ngx_http_cleanup_t* cleanup = ngx_http_cleanup_add(r, 0);
if (cleanup == NULL) {
ngx_http_pagespeed_release_request_context(ctx);
return NGX_ERROR;
return CreateRequestContext::kError;
}
cleanup->handler = ngx_http_pagespeed_release_request_context;
cleanup->data = ctx;
ngx_http_set_ctx(r, ctx, ngx_pagespeed);
return NGX_OK;
return CreateRequestContext::kOk;
}
// Send each buffer in the chain to the proxy_fetch for optimization.
@@ -841,6 +949,36 @@ ngx_http_pagespeed_body_filter(ngx_http_request_t* r, ngx_chain_t* in) {
}
#endif
// Based on ngx_http_add_cache_control.
ngx_int_t
ngx_http_pagespeed_set_cache_control(
ngx_http_request_t* r, char* cache_control) {
if (r->headers_out.cache_control.elts == NULL) {
ngx_int_t rc = ngx_array_init(&r->headers_out.cache_control, r->pool,
1, sizeof(ngx_table_elt_t *));
if (rc != NGX_OK) {
return NGX_ERROR;
}
}
ngx_table_elt_t** cache_control_headers = static_cast<ngx_table_elt_t**>(
ngx_array_push(&r->headers_out.cache_control));
if (cache_control_headers == NULL) {
return NGX_ERROR;
}
cache_control_headers[0] = static_cast<ngx_table_elt_t*>(
ngx_list_push(&r->headers_out.headers));
if (cache_control_headers[0] == NULL) {
return NGX_ERROR;
}
cache_control_headers[0]->hash = 1;
ngx_str_set(&cache_control_headers[0]->key, "Cache-Control");
cache_control_headers[0]->value.len = strlen(cache_control);
cache_control_headers[0]->value.data =
reinterpret_cast<u_char*>(cache_control);
return NGX_OK;
}
ngx_int_t
ngx_http_pagespeed_header_filter(ngx_http_request_t* r) {
ngx_http_pagespeed_request_ctx_t* ctx =
@@ -866,14 +1004,18 @@ ngx_http_pagespeed_header_filter(ngx_http_request_t* r) {
return ngx_http_next_header_filter(r);
}
int rc = ngx_http_pagespeed_create_request_context(
r, false /* not a resource fetch */);
if (rc == NGX_DECLINED) {
// ModPagespeed=off
return ngx_http_next_header_filter(r);
} else if (rc != NGX_OK) {
switch (ngx_http_pagespeed_create_request_context(
r, false /* not a resource fetch */)) {
case CreateRequestContext::kError:
case CreateRequestContext::kNotUnderstood:
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return rc;
return NGX_ERROR;
case CreateRequestContext::kPagespeedDisabled:
case CreateRequestContext::kStaticContent:
case CreateRequestContext::kInvalidUrl:
return ngx_http_next_header_filter(r);
case CreateRequestContext::kOk:
break;
}
// We're modifying content below, so switch to 'Transfer-Encoding: chunked'
@@ -889,27 +1031,8 @@ ngx_http_pagespeed_header_filter(ngx_http_request_t* r) {
ngx_http_clear_last_modified(r);
// Don't cache html. See mod_instaweb:instaweb_fix_headers_filter.
// Based on ngx_http_add_cache_control.
if (r->headers_out.cache_control.elts == NULL) {
ngx_int_t rc = ngx_array_init(&r->headers_out.cache_control, r->pool,
1, sizeof(ngx_table_elt_t *));
if (rc != NGX_OK) {
return NGX_ERROR;
}
}
ngx_table_elt_t** cache_control_headers = static_cast<ngx_table_elt_t**>(
ngx_array_push(&r->headers_out.cache_control));
if (cache_control_headers == NULL) {
return NGX_ERROR;
}
cache_control_headers[0] = static_cast<ngx_table_elt_t*>(
ngx_list_push(&r->headers_out.headers));
if (cache_control_headers[0] == NULL) {
return NGX_ERROR;
}
cache_control_headers[0]->hash = 1;
ngx_str_set(&cache_control_headers[0]->key, "Cache-Control");
ngx_str_set(&cache_control_headers[0]->value, "max-age=0, no-cache");
ngx_http_pagespeed_set_cache_control(
r, const_cast<char*>("max-age=0, no-cache"));
r->filter_need_in_memory = 1;
@@ -928,7 +1051,62 @@ ngx_http_pagespeed_header_filter(ngx_http_request_t* r) {
return ngx_http_next_header_filter(r);
}
ngx_int_t ngx_http_pagespeed_static_handler(ngx_http_request_t* r) {
ngx_http_pagespeed_srv_conf_t* cfg =
static_cast<ngx_http_pagespeed_srv_conf_t*>(
ngx_http_get_module_srv_conf(r, ngx_pagespeed));
CHECK(cfg != NULL);
CHECK(cfg->server_context != NULL);
StringPiece request_uri_path = ngx_http_pagespeed_str_to_string_piece(r->uri);
// Strip out the common prefix url before sending to
// StaticJavascriptManager.
StringPiece file_name = request_uri_path.substr(
strlen(net_instaweb::NgxRewriteDriverFactory::kStaticJavaScriptPrefix));
StringPiece file_contents;
StringPiece cache_header;
bool ok = cfg->server_context->static_javascript_manager()->GetJsSnippet(
file_name, &file_contents, &cache_header);
if (!ok) {
return NGX_ERROR;
}
// Set and send headers.
r->headers_out.status = NGX_HTTP_OK;
// Content length
r->headers_out.content_length_n = file_contents.size();
r->headers_out.content_type.len = sizeof("text/javascript") - 1;
r->headers_out.content_type_len = r->headers_out.content_type.len;
r->headers_out.content_type.data =
reinterpret_cast<u_char*>(const_cast<char*>("text/javascript"));
r->headers_out.content_type_lowcase = r->headers_out.content_type.data;
// Cache control
char* cache_control_s = ngx_http_string_piece_to_pool_string(
r->pool, cache_header);
if (cache_control_s == NULL) {
return NGX_ERROR;
}
ngx_http_pagespeed_set_cache_control(r, cache_control_s);
ngx_http_send_header(r);
// Send the body.
ngx_chain_t* out;
ngx_int_t rc = ngx_http_pagespeed_string_piece_to_buffer_chain(
r->pool, file_contents, &out, true /* send_last_buf */);
if (rc == NGX_ERROR) {
return NGX_ERROR;
}
CHECK(rc == NGX_OK);
return ngx_http_output_filter(r, out);
}
// Handle requests for resources like example.css.pagespeed.ce.LyfcM6Wulf.css
// and for static content like /ngx_pagespeed_static/js_defer.q1EBmcgYOC.js
ngx_int_t
ngx_http_pagespeed_content_handler(ngx_http_request_t* r) {
// TODO(jefftk): return NGX_DECLINED for non-get non-head requests.
@@ -936,10 +1114,18 @@ ngx_http_pagespeed_content_handler(ngx_http_request_t* r) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http pagespeed handler \"%V\"", &r->uri);
int rc = ngx_http_pagespeed_create_request_context(
r, true /* is a resource fetch */);
if (rc != NGX_OK) {
return rc; // rc will be NGX_DECLINED if it's not a pagespeed resource.
switch (ngx_http_pagespeed_create_request_context(
r, true /* is a resource fetch */)) {
case CreateRequestContext::kError:
return NGX_ERROR;
case CreateRequestContext::kNotUnderstood:
case CreateRequestContext::kPagespeedDisabled:
case CreateRequestContext::kInvalidUrl:
return NGX_DECLINED;
case CreateRequestContext::kStaticContent:
return ngx_http_pagespeed_static_handler(r);
case CreateRequestContext::kOk:
break;
}
ngx_http_pagespeed_request_ctx_t* ctx =
src/ngx_pagespeed.h
+8
View File
@@ -25,6 +25,14 @@ extern "C" {
#include "net/instaweb/util/public/string_util.h"
// 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
ngx_http_pagespeed_string_piece_to_buffer_chain(
ngx_pool_t* pool, StringPiece sp, ngx_chain_t** link_ptr,
bool send_last_buf);
StringPiece
ngx_http_pagespeed_str_to_string_piece(ngx_str_t s);
src/ngx_rewrite_driver_factory.cc
+9
View File
@@ -28,6 +28,7 @@
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/static_javascript_manager.h"
#include "net/instaweb/util/public/google_message_handler.h"
#include "net/instaweb/util/public/google_timer.h"
#include "net/instaweb/util/public/lru_cache.h"
@@ -77,6 +78,9 @@ NgxRewriteDriverFactory::~NgxRewriteDriverFactory() {
slow_worker_->ShutDown();
}
const char NgxRewriteDriverFactory::kStaticJavaScriptPrefix[] =
"/ngx_pagespeed_static/";
Hasher* NgxRewriteDriverFactory::NewHasher() {
return new MD5Hasher;
}
@@ -167,4 +171,9 @@ RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptions() {
return new NgxRewriteOptions();
}
void NgxRewriteDriverFactory::InitStaticJavascriptManager(
StaticJavascriptManager* static_js_manager) {
static_js_manager->set_library_url_prefix(kStaticJavaScriptPrefix);
}
} // namespace net_instaweb
src/ngx_rewrite_driver_factory.h
+6
View File
@@ -27,9 +27,12 @@
namespace net_instaweb {
class SlowWorker;
class StaticJavaScriptManager;
class NgxRewriteDriverFactory : public RewriteDriverFactory {
public:
static const char kStaticJavaScriptPrefix[];
NgxRewriteDriverFactory();
virtual ~NgxRewriteDriverFactory();
virtual Hasher* NewHasher();
@@ -45,6 +48,9 @@ class NgxRewriteDriverFactory : public RewriteDriverFactory {
// Create a new RewriteOptions. In this implementation it will be an
// NgxRewriteOptions.
virtual RewriteOptions* NewRewriteOptions();
// Initializes the StaticJavascriptManager.
virtual void InitStaticJavascriptManager(
StaticJavascriptManager* static_js_manager);
SlowWorker* slow_worker() { return slow_worker_.get(); }
test/nginx_system_test.sh
+2
View File
@@ -42,4 +42,6 @@ if [ ! -e "$SYSTEM_TEST_FILE" ] ; then
exit 2
fi
PSA_JS_LIBRARY_URL_PREFIX="ngx_pagespeed_static"
source $SYSTEM_TEST_FILE