@@ -29,8 +29,8 @@ <link rel="stylesheet" href="styles.css" type="text/css" media="screen" /> <link rel="stylesheet" href="themes/common/print.css" type="text/css" media="print" /> - <link rel="alternate" type="application/rss+xml" title="Posts on '[% blog_name | html %]' (RSS 2.0)" href="http://[% resty_server %]/=/feed/Post/count/100?user=[% blog_owner %].Public" /> - <link rel="alternate" type="application/rss+xml" title="Comments on '[% blog_name | html %]' (RSS 2.0)" href="http://[% resty_server %]/=/feed/Comment/count/100?user=[% blog_owner %].Public" /> + <link rel="alternate" type="application/rss+xml" title="Posts on '[% blog_name | html %]' (RSS 2.0)" href="http://[% resty_server %]/=/feed/Post/_user/[% blog_owner %].Public" /> + <link rel="alternate" type="application/rss+xml" title="Comments on '[% blog_name | html %]' (RSS 2.0)" href="http://[% resty_server %]/=/feed/Comment/_user/[% blog_owner %].Public" /> </head> demo/Blog/template/header.tt @@ -3,6 +3,7 @@ define CMDS -perl -Iblib -c bin/openresty -sudo killall lighttpd sudo /etc/init.d/lighttpd restart + sudo /opt/eeeeresty/apache/bin/apachectl restart sleep 1 -sudo find lib -name '*.pmc' -delete -sudo rm -rf /tmp/FileCache @@ -34,6 +35,7 @@ debug: all %.t: all force perl -c bin/openresty sudo /etc/init.d/lighttpd restart + sudo /opt/eeeeresty/apache/bin/apachectl restart -sudo rm -rf /tmp/FileCache -rm -f t/cur-timer.dat -prove -Ilib $@ dev.mk @@ -358,13 +358,20 @@ sub response { index($ENV{HTTP_ACCEPT_ENCODING} || '', 'gzip') >= 0; #warn "use gzip: $use_gzip\n"; my $http_status = $self->{_http_status}; - print "$http_status\n"; + if ($OpenResty::Server::IsRunning) { + print "$http_status\r\n"; + } else { + $http_status =~ s{^\s*HTTP/\d+\.\d+\s*}{}; + #warn "http_status: $http_status\n"; + binmode \*STDOUT; + print "Status: $http_status\r\n"; + } + #print "$http_status\r\n"; # warn "$http_status"; my $type = $self->{_type} || 'text/plain'; #warn $s; my $str = ''; if (my $bin_data = $self->{_bin_data}) { - binmode \*STDOUT; local $_; if (my $callback = $self->{_callback}) { chomp($bin_data); lib/OpenResty.pm @@ -4,8 +4,11 @@ use strict; use warnings; use base qw(HTTP::Server::Simple::CGI); +our $IsRunning = 0; + sub handle_request { my ($self, $cgi) = @_; + $IsRunning = 1; OpenResty::Dispatcher->process_request($cgi); } lib/OpenResty/Server.pm @@ -143,8 +143,11 @@ sub _request { if (is_utf8($Buffer)) { $Buffer = encode('utf8', $Buffer); } - if ($Buffer =~ /^HTTP\/1\.[01] (\d+) (\w+)\n/) { + if ($Buffer =~ /^HTTP\/1\.[01] (\d+) (\w+)\r?\n/) { $code = $1; + } else { + $Buffer = "HTTP/1.1 200 OK\r\n$Buffer"; + $code = 200; } my $res = HTTP::Response->parse($Buffer); # $code, $msg, $header, $content ) ## $res lib/WWW/OpenResty/Embedded.pm @@ -25,7 +25,7 @@ if ($backend->has_user("agentz")) { } my $res = $backend->add_user("agentz", 'blahblahblah'); -cmp_ok $res, '>', -1, "user added okay"; +ok $res, "user added okay"; $backend->set_user("agentz"); t/pg/sanity.t 6d3de249bc430995be4e8ddf6250761eb96c3ba7 agentzh agentzh@gmail.com http://github.com/agentzh/openresty/commit/884cbddb31e5fdbf57ff8750bee1a2c2266d9886 884cbddb31e5fdbf57ff8750bee1a2c2266d9886 2009-05-01T04:26:52-07:00 2009-05-01T04:26:52-07:00 now we honor the FastCGI protocol and send the Status header to the fastcgi manager be5cef247ae463e747d23f65e7daca271c609336 agentzh agentzh@gmail.com