---- dillo-0.7.2/src/IO/file.c.orig Sun May 4 12:33:54 2003
-+++ dillo-0.7.2/src/IO/file.c Sun May 4 12:40:09 2003
-@@ -29,6 +29,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <math.h> /* for rint */
-+#include <zlib.h>
+--- dillo-0.8.4/dpi/file.c.orig 2004-12-28 21:08:13.000000000 +0100
++++ dillo-0.8.4/dpi/file.c 2005-01-22 21:46:07.825296392 +0100
+@@ -15,6 +15,7 @@
+ * With new HTML layout.
+ */
+
++#define _GNU_SOURCE
+ #include <pthread.h>
+ #include <ctype.h> /* for tolower */
+@@ -32,6 +33,7 @@
+ #include <signal.h>
#include <errno.h> /* for errno */
- #include "Url.h"
-@@ -66,7 +67,7 @@
- pthread_t th1; /* This transfer's thread id. */
- } DilloFile;
+ #include <glib.h>
++#include <zlib.h>
--
-+#define GZIP_ENCODING 1
+ #include "dpiutil.h"
+@@ -71,7 +73,7 @@
/*
- * Local data
-@@ -122,15 +123,27 @@
- struct stat sb;
- DilloFile *Dfile;
+ * Forward references
+ */
+-static const char *File_content_type(const char *filename);
++static const char *File_content_type(const char *filename, int *gzipped);
+ static gint File_get_file(ClientInfo *Client,
+ const gchar *filename,
+ struct stat *sb,
+@@ -401,7 +403,7 @@
+ cont = "application/executable";
+ filecont = "Executable";
+ } else {
+- filecont = cont = File_content_type(finfo->full_path);
++ filecont = cont = File_content_type(finfo->full_path, NULL);
+ if (!filecont || !strcmp(filecont, "application/octet-stream"))
+ filecont = "unknown";
+ }
+@@ -525,13 +527,24 @@
+ /*
+ * Return a content type based on the extension of the filename.
+ */
+-static const char *File_ext(const char *filename)
++static const char *File_ext(const char *filename, int *gzipped)
+ {
+- char *e;
++ char *e, *e2;
-- if ( (fd = open(filename, O_RDONLY)) < 0 || pipe(fds) )
-+ if ( (fd = open(filename, O_RDONLY)) < 0 || pipe(fds) ) {
+ if ( !(e = strrchr(filename, '.')) )
return NULL;
--
-+ }
-+ if (strncmp(strrchr(filename, '.'), ".gz", 3) == 0)
-+ ContentEncoding = GZIP_ENCODING;
- Dfile = g_new(DilloFile, 1);
- Dfile->FD_Read = fds[0];
- Dfile->FD_Write = fds[1];
- Dfile->FD = fd;
- Dfile->FileName = g_strdup(filename);
-- Dfile->FileSize = fstat(fd, &sb) ? -1 : (glong) sb.st_size;
-+ if (ContentEncoding == GZIP_ENCODING) {
-+ gchar *tmp_filename = g_strndup(filename, strlen(filename) - 3);
-+ Dfile->ContentType = File_content_type(tmp_filename);
-+ g_free(tmp_filename);
-+ Dfile->FileSize = -1;
+
++ if ((e > filename) && !strcasecmp(e+1, "gz") &&
++ ((e2 = memrchr(filename, '.', e-filename)) != NULL)) {
++ e2++;
++ if (!strncasecmp(e2, "html.", 5) ||
++ !strncasecmp(e2, "htm.", 4) ||
++ !strncasecmp(e2, "shtml.", 6)) {
++ if(gzipped != NULL)
++ *gzipped = 1;
++ return "text/html";
++ }
+ }
-+ else {
-+ Dfile->ContentType = File_content_type(filename);
-+ Dfile->FileSize = fstat(fd, &sb) ? -1 : (glong) sb.st_size;
+ e++;
+
+ if (!strcasecmp(e, "gif")) {
+@@ -554,12 +567,12 @@
+ * Based on the extension, return the content_type for the file.
+ * (if there's no extension, analyze the data and try to figure it out)
+ */
+-static const char *File_content_type(const char *filename)
++static const char *File_content_type(const char *filename, int *gzipped)
+ {
+ gint fd;
+ const gchar *ct;
+
+- if (!(ct = File_ext(filename))) {
++ if (!(ct = File_ext(filename, gzipped))) {
+ /* everything failed, let's analyze the data... */
+ if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) != -1) {
+ gchar buf[256];
+@@ -582,16 +595,29 @@
+ {
+ int res;
+ struct stat sb;
++ char *tmp_filename = (char*)filename, *p;
+
+ if (stat(filename, &sb) != 0) {
++ char *e = strrchr(filename, '.');
++ if ((e == NULL) || strcasecmp(e + 1, "gz")) {
++ if ((p = malloc(strlen(filename) + 4)) != NULL) {
++ tmp_filename = p;
++ strcpy(tmp_filename, filename);
++ strcat(tmp_filename, ".gz");
++ filename = tmp_filename;
++ }
++ }
+ }
-+ Dfile->ContentEncoding = ContentEncoding;
++
++ if (stat(tmp_filename, &sb) != 0) {
+ /* stat failed, prepare a file-not-found error. */
+ res = FILE_NOT_FOUND;
+ } else if (S_ISDIR(sb.st_mode)) {
+ /* set up for reading directory */
+- res = File_get_dir(Client, filename, orig_url);
++ res = File_get_dir(Client, tmp_filename, orig_url);
+ } else {
+ /* set up for reading a file */
+- res = File_get_file(Client, filename, &sb, orig_url);
++ res = File_get_file(Client, tmp_filename, &sb, orig_url);
+ }
- return Dfile;
+ if (res == FILE_NOT_FOUND) {
+@@ -602,8 +628,10 @@
+ sock_handler_printf(Client->sh, 1,
+ "<dpi cmd='send_status_message' msg='"
+ "Failed to open the %s %s'>",
+- S_ISDIR(sb.st_mode) ? "directory" : "file", filename);
++ S_ISDIR(sb.st_mode) ? "directory" : "file", tmp_filename);
+ }
++ if(tmp_filename != filename)
++ free(tmp_filename);
}
-@@ -194,6 +207,7 @@
- DilloFile *Dfile = data;
- ssize_t nbytes;
+
+ /*
+@@ -644,6 +672,8 @@
const gchar *ct;
+ char buf[LBUF];
+ gint fd, st;
++ int gzipped = 0;
+ gzFile gzdata;
- /* Set this thread to detached state */
- pthread_detach(Dfile->th1);
-@@ -221,12 +235,23 @@
- write(Dfile->FD_Write, buf, strlen(buf));
+ if ( (fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
+ return FILE_NO_ACCESS;
+@@ -653,15 +683,32 @@
+ * todo: a better approach could be to detect&reject those types we know
+ * for sure we don't handle (as gzip, bzip, ELF, etc)
+ */
+- ct = File_content_type(filename);
++ ct = File_content_type(filename, &gzipped);
+ if (!ct || !strcmp(ct, "application/octet-stream"))
+ ct = "text/plain";
+-
+ /* Send DPI command */
+ sock_handler_printf(Client->sh, 1,
+ "<dpi cmd='start_send_page' url='%s'>\n", orig_url);
-- /* Append raw file contents */
-- while ( (nbytes = read(Dfile->FD, buf, 8192)) != 0 ) {
-- write(Dfile->FD_Write, buf, nbytes);
-+ /* decompress gzipped file */
-+ if (Dfile->ContentEncoding == GZIP_ENCODING) {
-+ gzdata = gzdopen(Dfile->FD, "r");
-+ while ((nbytes = gzread(gzdata, buf, 8192)) != 0 ) {
-+ write(Dfile->FD_Write, buf, nbytes);
-+ }
-+ gzclose(gzdata);
- }
-+ else {
-+ /* Append raw file contents */
-+ while ( (nbytes = read(Dfile->FD, buf, 8192)) != 0 ) {
-+ write(Dfile->FD_Write, buf, nbytes);
-+ }
++ if (gzipped) {
++ /* Send HTTP stream */
++ sock_handler_printf(Client->sh, 0,
++ "Content-Type: %s\n\n", ct);
+
-
- close(Dfile->FD);
++ gzdata = gzdopen(fd, "r");
++ do {
++ if ((st = gzread(gzdata, buf, LBUF)) > 0) {
++ if (sock_handler_write(Client->sh, buf, st, 0) != 0)
++ break;
++ } else if (st < 0) {
++ perror("[read]");
++ if (errno == EINTR || errno == EAGAIN)
++ continue;
++ }
++ } while (st > 0);
++ gzclose(gzdata);
++ } else {
+ /* Send HTTP stream */
+ sock_handler_printf(Client->sh, 0,
+ "Content-Type: %s\n"
+@@ -679,6 +726,7 @@
+ continue;
+ }
+ } while (st > 0);
+ }
- close(Dfile->FD_Write);
- File_dillofile_free(Dfile);
- return NULL;
-@@ -339,7 +364,7 @@
- static void File_get(ChainLink *Info, void *Data1, void *Data2)
- {
- const gchar *path;
-- gchar *filename;
-+ gchar *filename, *tmp_filename;
- gint fd;
- struct stat sb;
- const DilloUrl *Url = Data1;
-@@ -353,8 +378,15 @@
- filename = g_strdup(g_get_home_dir());
- else
- filename = a_Url_parse_hex_path(Url);
--
-+stat_point:
- if ( stat(filename, &sb) != 0 ) {
-+ char *ext = strrchr(filename, '.');
-+ if (ext && strcmp(ext, ".gz") != 0) {
-+ tmp_filename = filename;
-+ filename = g_strconcat(tmp_filename, ".gz", NULL);
-+ g_free(tmp_filename);
-+ goto stat_point;
-+ }
- /* stat failed, prepare a file-not-found error. */
- fd = -2;
- } else if (S_ISDIR(sb.st_mode)) {
+
+ /* todo: It may be better to send an error report to dillo instead of
+ * calling abort from g_error() */
+--- dillo-0.8.4/dpi/Makefile.am.orig 2004-11-21 12:16:00.000000000 +0100
++++ dillo-0.8.4/dpi/Makefile.am 2005-01-22 20:00:41.712011792 +0100
+@@ -18,7 +18,7 @@
+ ftp_filter_dpi_LDADD = @GLIB_LIBS@
+ https_filter_dpi_LDADD = @GLIB_LIBS@ @LIBSSL_LIBS@
+ hello_filter_dpi_LDADD = @GLIB_LIBS@
+-file_dpi_LDADD = @GLIB_LIBS@ @LIBPTHREAD_LIBS@
++file_dpi_LDADD = @GLIB_LIBS@ @LIBPTHREAD_LIBS@ -lz
+
+ file_dpi_LDFLAGS = @LIBPTHREAD_LDFLAGS@
+
projects / packages / dillo.git / blobdiff