![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] S2 stylesheets randomly returning 0 bytes
[commit: http://hg.dwscoalition.org/dw-free/rev/963b5689b324]
http://bugs.dwscoalition.org/show_bug.cgi?id=439
Fix If-Modified-Since logic for S2 stylesheets.
Patch by![[staff profile]](https://www.dreamwidth.org/img/silk/identity/user_staff.png)
mark.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=439
Fix If-Modified-Since logic for S2 stylesheets.
Patch by
mark.Files modified:
- cgi-bin/LJ/S2.pm
- htdocs/preview/entry.bml
- htdocs/talkread_s1short.bml
--------------------------------------------------------------------------------
diff -r 87012a117184 -r 963b5689b324 cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm Wed Mar 04 12:10:13 2009 -0800
+++ b/cgi-bin/LJ/S2.pm Thu Mar 05 02:14:56 2009 +0000
@@ -39,8 +39,7 @@ sub make_journal
my $ret;
$LJ::S2::ret_ref = \$ret;
- my ($entry, $page);
- my $con_opts = {};
+ my ( $entry, $page, $use_modtime );
if ($view eq "res") {
@@ -55,7 +54,7 @@ sub make_journal
$styleid = $1;
$entry = "print_stylesheet()";
$opts->{'contenttype'} = 'text/css';
- $con_opts->{'use_modtime'} = 1;
+ $use_modtime = 1;
} else {
$opts->{'handler_return'} = 404;
return;
@@ -64,9 +63,8 @@ sub make_journal
$u->{'_s2styleid'} = $styleid + 0;
- $con_opts->{'u'} = $u;
- $con_opts->{'style_u'} = $opts->{'style_u'};
- my $ctx = s2_context($r, $styleid, $con_opts);
+ # try to get an S2 context
+ my $ctx = s2_context( $styleid, use_modtime => $use_modtime, u => $u, style_u => $opts->{style_u} );
unless ($ctx) {
$opts->{'handler_return'} = OK;
return;
@@ -651,18 +649,17 @@ sub get_style
sub s2_context
{
- my $r = shift;
- my $styleid = shift;
- my $opts = shift || {};
-
- my $u = $opts->{u} || LJ::get_active_journal();
- my $style_u = $opts->{style_u} || $u;
+ my ( $styleid, %opts ) = @_;
+
+ # get arguments we'll use frequently
+ my $r = DW::Request->get;
+ my $u = $opts{u} || LJ::get_active_journal();
+ my $style_u = $opts{style_u} || $u;
# but it doesn't matter if we're using the minimal style ...
my %style;
eval {
- my $r = BML::get_request();
- if ($r->notes->{use_minimal_scheme}) {
+ if ( $r->notes( 'use_minimal_scheme' ) ) {
my $public = get_public_layers();
while (my ($layer, $name) = each %LJ::MINIMAL_STYLE) {
next unless $name ne "";
@@ -709,29 +706,25 @@ sub s2_context
}
unless ($okay) {
# load the default style instead, if we just tried to load a real one and failed
- if ($styleid) { return s2_context($r, 0, $opts); }
+ return s2_context( 0, %opts )
+ if $styleid;
# were we trying to load the default style?
- $r->content_type("text/html");
- # FIXME: not necessary in ModPerl 2.0?
- #$r->send_http_header();
- $r->print("<b>Error preparing to run:</b> One or more layers required to load the stock style have been deleted.");
+ $r->content_type( 'text/html' );
+ $r->print( '<b>Error preparing to run:</b> One or more layers required to load the stock style have been deleted.' );
return undef;
}
- if ($opts->{'use_modtime'})
- {
- my $ims = $r->headers_in->{"If-Modified-Since"};
- my $ourtime = LJ::time_to_http($modtime);
- if ($ims eq $ourtime) {
+ # if we are supposed to use modtime checking (i.e. for stylesheets) then go
+ # ahead and do that logic now
+ if ( $opts{use_modtime} ) {
+ if ( $r->header_in( 'If-Modified-Since' ) eq LJ::time_to_http( $modtime )) {
# 304 return; unload non-public layers
LJ::S2::cleanup_layers(@layers);
- $r->status_line("304 Not Modified");
- # FIXME: not necessary in ModPerl 2.0?
- #$r->send_http_header();
+ $r->status_line( '304 Not Modified' );
return undef;
} else {
- $r->headers_out->{"Last-Modified"} = $ourtime;
+ $r->set_last_modified( $modtime );
}
}
@@ -755,14 +748,9 @@ sub s2_context
# failure to generate context; unload our non-public layers
LJ::S2::cleanup_layers(@layers);
-
- my $err = $@;
- $r->content_type("text/html");
- # FIXME: not necessary in ModPerl 2.0 anymore?
- #$r->send_http_header();
- $r->print("<b>Error preparing to run:</b> $err");
+ $r->content_type( 'text/html' );
+ $r->print( '<b>Error preparing to run:</b> ' . $@ );
return undef;
-
}
sub escape_all_props {
diff -r 87012a117184 -r 963b5689b324 htdocs/preview/entry.bml
--- a/htdocs/preview/entry.bml Wed Mar 04 12:10:13 2009 -0800
+++ b/htdocs/preview/entry.bml Thu Mar 05 02:14:56 2009 +0000
@@ -40,11 +40,10 @@
# expand the embedded content for reals
LJ::EmbedModule->expand_entry($u, \$event, preview => 1,);
- my $r = BML::get_request;
+ my $r = BML::get_request();
my $ctx;
if ($u && $up) {
- my $r = BML::get_request();
$r->notes->{_journal} = $u->{user};
$r->notes->{journalid} = $u->{userid};
@@ -61,7 +60,7 @@
LJ::run_hooks("force_s1", $u, \$forceflag);
# check whether to use custom comment pages
- $ctx = LJ::S2::s2_context($r, $u->{'s2_style'});
+ $ctx = LJ::S2::s2_context( $u->{s2_style} );
my $view_entry_disabled = $ctx->[S2::PROPS]->{'view_entry_disabled'} if $ctx;
return (2, $u->{'s2_style'}) unless $forceflag || $view_entry_disabled;
diff -r 87012a117184 -r 963b5689b324 htdocs/talkread_s1short.bml
--- a/htdocs/talkread_s1short.bml Wed Mar 04 12:10:13 2009 -0800
+++ b/htdocs/talkread_s1short.bml Thu Mar 05 02:14:56 2009 +0000
@@ -13,7 +13,7 @@ body<=
# call s2 entry point to talkread in s1shortcomings
my $styleid = 's1short'; # special virtual styleid
- my $ctx = LJ::S2::s2_context($r, $styleid);
+ my $ctx = LJ::S2::s2_context( $styleid );
my $entry = LJ::Entry->new($ju, ditemid => 1891);
--------------------------------------------------------------------------------