- bumped version to 0.5.7.

- use dist_dir rather than module_dir in Captha.pm and better diagnostics.

Author: agentzh

META.yml

@@ -75,4 +75,4 @@ requires:
   Time::HiRes: 0
   YAML::Syck: 1.04
   perl: 5.6.1
-version: 0.5.6
+version: 0.5.7

README

@@ -2,7 +2,7 @@ NAME
     OpenResty - General-purpose web service platform for web applications
 
 VERSION
-    This document describes OpenResty 0.5.6 released on May 3, 2009.
+    This document describes OpenResty 0.5.7 released on May 4, 2009.
 
 DESCRIPTION
     This module implements the server-side OpenResty web service protocol.

bin/releng

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/opt/perl/bin/perl
 
 use strict;
 use warnings;

demo/Admin/Makefile

@@ -51,3 +51,7 @@ upload2: pack
 upload: all
 	script/upload
 
+push:
+	-mkdir -p /opt/eeeeresty/htdocs/admin/
+	cp -rup `pwd`/out/* /opt/eeeeresty/htdocs/admin/
+

lib/OpenResty/Handler/Captcha.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use utf8;
 
-use File::ShareDir qw(module_dir);
+use File::ShareDir qw(dist_dir);
 use File::Spec;
 use Crypt::CBC;
 use MIME::Base64;
@@ -24,12 +24,19 @@ sub level2name {
 
 my $FontPath = "$FindBin::Bin/../share/font/wqy-zenhei.ttf";
 eval {
-    if ( !-f $FontPath )
-    {
-        $FontPath = File::Spec->catfile( module_dir('OpenResty'),
+    if ( !-f $FontPath ) {
+        $FontPath = File::Spec->catfile( dist_dir('OpenResty'),
             'font/wqy-zenhei.ttf' );
+        if ( ! -f $FontPath || !-r $FontPath ) {
+            warn "WARNING: Chinese font file $FontPath not found or not readable.\n";
+        } else {
+            #warn "Found chinese font file $FontPath.\n";
+        }
     }
 };
+if ($@) {
+    warn $@;
+}
 
 my $PLAINTEXT_SEP = ":";     # separator character in plaintext str
 my $MIN_TIMESPAN  = 1;       # minimum timespan(sec) for a valid Captcha,