Implement If-Modified-Since manually, since browser support is so strange.

diff --git a/www/analysis.pl b/www/analysis.pl
index 616976459e748b953e184dcb5867366cfdc3bedc..46795a98632ef39b0b072e4b864233aaea1a5b8c 100755 (executable)
--- a/www/analysis.pl
+++ b/www/analysis.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl
 use CGI;
 use POSIX;
 #! /usr/bin/perl
 use CGI;
 use POSIX;

-use Date::Manip;

 use Linux::Inotify2;
 use AnyEvent;
 use strict;
 use Linux::Inotify2;
 use AnyEvent;
 use strict;


@@ -26,11 +25,11 @@ my $wait = AnyEvent->timer (
        cb    => sub { $cv->send; },
 );
 
        cb    => sub { $cv->send; },
 );
 

+# Yes, this is reinventing If-Modified-Since, but browsers are so incredibly
+# unpredictable on this, so blargh.

 my $ims = 0;
 my $ims = 0;

-if (exists($ENV{'HTTP_IF_MODIFIED_SINCE'})) {
-       my $date = Date::Manip::Date->new;
-       $date->parse($ENV{'HTTP_IF_MODIFIED_SINCE'});
-       $ims = $date->printf("%s");
+if (defined($cgi->param('ims')) && $cgi->param('ims') ne '') {
+       $ims = $cgi->param('ims');

 }
 my $time = (stat($json_filename))[9];
 
 }
 my $time = (stat($json_filename))[9];
 


@@ -40,20 +39,11 @@ if ($time > $ims) {
        exit;
 }
 
        exit;
 }
 

-# If not, wait, then send. Apache will deal with the 304-ing.
-if (defined($cgi->param('first')) && $cgi->param('first') != 1) {
-       $cv->recv;
-}
+# If not, wait, then send.
+$cv->recv;

 output();
 
 sub output {
 output();
 
 sub output {

-       my $time = (stat($json_filename))[9];
-       my $lm_str = POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
-
-       print CGI->header(-type=>'text/json',
-                         -last_modified=>$lm_str,
-                         -access_control_allow_origin=>'http://analysis.sesse.net',
-                         -expires=>'now');

        open my $fh, "<", $json_filename
                or die "$json_filename: $!";
        my $data;
        open my $fh, "<", $json_filename
                or die "$json_filename: $!";
        my $data;


@@ -61,5 +51,13 @@ sub output {
                local $/ = undef;
                $data = <$fh>;
        }
                local $/ = undef;
                $data = <$fh>;
        }

+       my $time = (stat($fh))[9];
+       close $fh;
+
+       print CGI->header(-type=>'text/json',
+                         -x_remoteglot_last_modified=>$time,
+                         -access_control_allow_origin=>'http://analysis.sesse.net',
+                         -access_control_expose_headers=>'X-Remoteglot-Last-Modified',
+                         -expires=>'now');

        print $data;
 }
        print $data;
 }

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 34fa7f77082833d0998cfed7bf3479fabd3c0ce9..e220f4a6d390b3d698890e2924480f5ee3c223e5 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -2,14 +2,16 @@ var board = [];
 var arrows = [];
 var arrow_targets = [];
 var occupied_by_arrows = [];
 var arrows = [];
 var arrow_targets = [];
 var occupied_by_arrows = [];

+var ims = 0;

 var highlight_from = undefined;
 var highlight_to = undefined;
 
 var request_update = function(board, first) {
        $.ajax({
                //url: "http://analysis.sesse.net/analysis.pl?first=" + first
 var highlight_from = undefined;
 var highlight_to = undefined;
 
 var request_update = function(board, first) {
        $.ajax({
                //url: "http://analysis.sesse.net/analysis.pl?first=" + first

-               url: "http://analysis.sesse.net:5000/analysis.pl?first=" + first
-       }).done(function(data) {
+               url: "http://analysis.sesse.net:5000/analysis.pl?ims=" + ims
+       }).done(function(data, textstatus, xhr) {
+               ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified');

                update_board(board, data);
        });
 }
                update_board(board, data);
        });
 }