lib/fcgi.c lib/fcgi.h @@ -1,28 +1,31 @@ -CFLAGS = -I. -I/opt/local/include/mysql5/mysql -std=c99 -pedantic -g -LDFLAGS = -L/opt/local/lib/mysql5/mysql -lmysqlclient +CFLAGS = -std=c99 -pedantic -g -I. +MYSQL_LDFLAGS = -L/opt/local/lib/mysql5/mysql -lmysqlclient +FCGI_LDFLAGS = -L/opt/local/lib -lfcgi -all: public/memereap.cgi +all: public/memereap.fcgi - -public/memereap.cgi: lib/cgi.o lib/db.o lib/response.o lib/routes.o lib/template.o\ +public/memereap.fcgi: lib/fcgi.o lib/db.o lib/response.o lib/routes.o lib/template.o\ models/user.o\ controllers/user_controller.o\ views/user_views.o - cc $(LDFLAGS) -o $@ $^ - + cc $(MYSQL_LDFLAGS) $(FCGI_LDFLAGS) -o $@ $^ + check: tests/bin/db_test tests/bin/user_test reload tests/bin/db_test tests/bin/user_test tests/bin/db_test: tests/db_test.o lib/db.o - cc $(LDFLAGS) -o $@ $^ + cc $(MYSQL_LDFLAGS) -o $@ $^ tests/bin/user_test: tests/user_test.o lib/db.o models/user.o - cc $(LDFLAGS) -o $@ $^ + cc $(MYSQL_LDFLAGS) -o $@ $^ lib/db.o: lib/mysql.c - cc $(CFLAGS) -c -o $@ $< + cc $(CFLAGS) -I/opt/local/include/mysql5/mysql -c -o $@ $< + +lib/fcgi.o: lib/fcgi.c + cc $(CFLAGS) -I/opt/local/include -c -o $@ $< reload: mysql -u root memereap_test < db/memereap_test.sql @@ -31,5 +34,5 @@ dump: mysqldump -u root memereap_test > db/memereap_test.sql clean: - rm -f public/memereap.cgi tests/bin/* lib/*.o models/*.o controllers/*.o views/*.o tests/*.o + rm -f public/memereap.fcgi tests/bin/* lib/*.o models/*.o controllers/*.o views/*.o tests/*.o Makefile @@ -1,6 +1,6 @@ #include "db.h" -#include <stdio.h> +#include <fcgi_stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> @@ -72,7 +72,6 @@ void make_db_time(char* buf, const struct tm* tm) { strftime(buf, 20, "%Y-%m-%d %H:%M:%S", tm); } - int select_str(char* buf, const char* stmt) { MYSQL_RES* res; MYSQL_ROW row; lib/mysql.c @@ -1,6 +1,6 @@ #include "response.h" -#include <stdio.h> +#include <fcgi_stdio.h> #include <string.h> static int response_code = 200; lib/response.c @@ -1,6 +1,6 @@ #include "routes.h" -#include <stdio.h> +#include <fcgi_stdio.h> #include <string.h> #include "lib/response.h" lib/routes.c @@ -1,6 +1,6 @@ #include "template.h" -#include <stdio.h> +#include <fcgi_stdio.h> #include <string.h> #include <stdlib.h> lib/template.c @@ -1,6 +1,6 @@ #include "user.h" -#include <stdio.h> +#include <fcgi_stdio.h> #include <stdlib.h> #include <string.h> #include "lib/db.h" models/user.c @@ -1 +1 @@ -memereap.cgi +memereap.fcgi public/.gitignore @@ -1,10 +1,11 @@ -AddHandler cgi-script .cgi Options +FollowSymLinks +ExecCGI +AddHandler fastcgi-script .fcgi RewriteEngine On RewriteRule ^$ index.html [QSA] RewriteRule ^([^.]+)$ $1.html [QSA] RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ memereap.cgi [QSA,L] + +RewriteRule ^(.*)$ memereap.fcgi [QSA,L] public/.htaccess @@ -1,4 +1,4 @@ -#include <stdio.h> +#include <fcgi_stdio.h> #include <stdlib.h> #include <assert.h> #include <string.h> tests/db_test.c @@ -1,4 +1,4 @@ -#include <stdio.h> +#include <fcgi_stdio.h> #include <stdlib.h> #include <assert.h> #include <string.h> tests/user_test.c lib/cgi.c lib/cgi.h 1ce212403c33386bf2402725954b6196e2f21c62 Joel Hayhurst joelmichael@gmail.com http://github.com/joelmichael/memereap/commit/5379e0dc04485ccc5aca0346120ee074cf212690 5379e0dc04485ccc5aca0346120ee074cf212690 2009-05-29T15:34:03-07:00 2009-05-29T15:34:03-07:00 use fcgi 879a32398ab2acd551d5f6476f3e7f7050ef069e Joel Hayhurst joelmichael@gmail.com