(*) Add 'C' log item: Contet-Type

  (*) Fix error with length of request_uri field (50 -> 255)

4 files changed, 44 insertions, 0 deletions

diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index 2d8c05bcd5b3..f971ecfe0199 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.grubbybaby.com/mod_log_sql/
 
@@ -45,6 +46,7 @@ post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/make_combined_log.pl ${LOCALBASE}/share/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}/HTML
+	@${INSTALL_DATA} ${FILESDIR}/FreeBSD-readme.txt ${LOCALBASE}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.ps ${LOCALBASE}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/Documentation/documentation.txt ${LOCALBASE}/share/doc/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/Documentation/README ${LOCALBASE}/share/doc/${PORTNAME}/
diff --git a/www/mod_log_sql/files/FreeBSD-readme.txt b/www/mod_log_sql/files/FreeBSD-readme.txt
new file mode 100644
index 000000000000..7820728b5ac8
--- /dev/null
+++ b/www/mod_log_sql/files/FreeBSD-readme.txt
@@ -0,0 +1,8 @@
+
+
+   This port adds 'C' character for LogSQLTransferLogFormat.
+   It means 'Contet-Type' header of answer.
+   Filed is 'content_type VARCHAR(64)'.
+
+
+                             Lev Serebryakov <lev@FreeBSD.org>
diff --git a/www/mod_log_sql/files/patch-mod_log_sql.c b/www/mod_log_sql/files/patch-mod_log_sql.c
new file mode 100644
index 000000000000..324825d47dd4
--- /dev/null
+++ b/www/mod_log_sql/files/patch-mod_log_sql.c
@@ -0,0 +1,33 @@
+--- mod_log_sql.c.orig	Wed Aug  6 18:46:10 2003
++++ mod_log_sql.c	Wed Aug  6 18:49:22 2003
+@@ -225,6 +225,11 @@
+ 	return r->args;
+ }
+ 
++static const char *extract_content_type(request_rec *r, char *a)
++{
++	return r->content_type;
++}
++
+ static const char *extract_status(request_rec *r, char *a)
+ {
+ 	return pfmt(r->pool, r->status);
+@@ -538,6 +543,7 @@
+ 	{   'a', extract_request_args,      "request_args",     1, 1    },
+ 	{   'b', extract_bytes_sent,        "bytes_sent",       0, 0    },
+     {   'c', extract_cookie,            "cookie",           0, 1    },
++	{   'C', extract_content_type,      "content_type",  0, 1        },
+     {   'e', extract_env_var,           "env_var",          0, 1    },
+     {   'f', extract_request_file,      "request_file",     0, 1    },
+ 	{   'H', extract_request_protocol,  "request_protocol", 0, 1    },
+@@ -833,8 +839,9 @@
+        request_method varchar(10),\
+        request_protocol varchar(10),\
+        request_time char(28),\
+-       request_uri varchar(50),\
++       request_uri varchar(255),\
+ 	   request_args varchar(255),\
++       content_type varchar(64),\
+        server_port smallint unsigned,\
+        ssl_cipher varchar(25),\
+        ssl_keysize smallint unsigned,\
diff --git a/www/mod_log_sql/pkg-plist b/www/mod_log_sql/pkg-plist
index 53ec06af9f10..be9bc372073f 100644
--- a/www/mod_log_sql/pkg-plist
+++ b/www/mod_log_sql/pkg-plist
@@ -5,6 +5,7 @@ share/mod_log_sql/LICENSE
 share/mod_log_sql/CHANGELOG
 share/mod_log_sql/create_tables.sql
 share/mod_log_sql/make_combined_log.pl
+%%PORTDOCS%%share/doc/mod_log_sql/FreeBSD-readme.txt
 %%PORTDOCS%%share/doc/mod_log_sql/documentation.ps
 %%PORTDOCS%%share/doc/mod_log_sql/documentation.txt
 %%PORTDOCS%%share/doc/mod_log_sql/HTML/contents.png