[ViewVC] Diff of: cvs/thttpd/libhttpd.c

Comparing thttpd/libhttpd.c (file contents):
Revision 1.1 by root, Mon Jun 18 21:11:56 2001 UTC vs.
Revision 1.1.2.1 by root, Mon Jun 18 21:19:51 2001 UTC

 static char** make_envp( httpd_conn* hc );
 static char** make_argp( httpd_conn* hc );
 static void cgi_interpose_input( httpd_conn* hc, int wfd );
 static void post_post_garbage_hack( httpd_conn* hc );
 static void cgi_interpose_output( httpd_conn* hc, int rfd );
-static void cgi_child( httpd_conn* hc );
+static void cgi_child( httpd_conn* hc, char* exefilename );
-static off_t cgi( httpd_conn* hc );
+static off_t cgi( httpd_conn* hc, char* exefilename );
 static int really_start_request( httpd_conn* hc, struct timeval* nowP );
 static void make_log_entry( httpd_conn* hc, struct timeval* nowP );
 static int check_referer( httpd_conn* hc );
 static int really_check_referer( httpd_conn* hc );
 static int sockaddr_check( httpd_sockaddr* saP );
     {
     if ( hs->binding_hostname != (char*) 0 )
 	free( (void*) hs->binding_hostname );
     if ( hs->cwd != (char*) 0 )
 	free( (void*) hs->cwd );
+    if ( hs->autoindex_prog != (char*) 0 )
+	free( (void*) hs->autoindex_prog );
     if ( hs->cgi_pattern != (char*) 0 )
 	free( (void*) hs->cgi_pattern );
     if ( hs->charset != (char*) 0 )
 	free( (void*) hs->charset );
     if ( hs->url_pattern != (char*) 0 )
 httpd_server*
 httpd_initialize(
     char* hostname, httpd_sockaddr* sa4P, httpd_sockaddr* sa6P, int port,
     char* cgi_pattern, char* charset, char* cwd, int no_log, FILE* logfp,
     int no_symlink, int vhost, int global_passwd, char* url_pattern,
-    char* local_pattern, int no_empty_referers )
+    char* local_pattern, int no_empty_referers,
+    char* autoindex_prog)
     {
     httpd_server* hs;
     static char ghnbuf[256];
     char* cp;
 	    }
 	/* Nuke any leading slashes in the cgi pattern. */
 	while ( ( cp = strstr( hs->cgi_pattern, "|/" ) ) != (char*) 0 )
 	    (void) strcpy( cp + 1, cp + 2 );
 	}
+    hs->autoindex_prog = autoindex_prog ? strdup( autoindex_prog ) : 0;
     hs->charset = strdup( charset );
     hs->cwd = strdup( cwd );
     if ( hs->cwd == (char*) 0 )
 	{
 	syslog( LOG_CRIT, "out of memory copying cwd" );
     checked[0] = '\0';
     checkedlen = 0;
     restlen = strlen( path );
     httpd_realloc_str( &rest, &maxrest, restlen );
     (void) strcpy( rest, path );
-    if ( rest[restlen - 1] == '/' )
-	rest[--restlen] = '\0';         /* trim trailing slash */
     if ( ! tildemapped )
 	/* Remove any leading slashes. */
 	while ( rest[0] == '/' )
 	    {
 	    (void) strcpy( rest, &(rest[1]) );
     }
 /* CGI child process. */
 static void
-cgi_child( httpd_conn* hc )
+cgi_child( httpd_conn* hc, char* exefilename )
     {
     int r;
     char** argp;
     char** envp;
     char* binary;
     /* Split the program into directory and binary, so we can chdir()
     ** to the program's own directory.  This isn't in the CGI 1.1
     ** spec, but it's what other HTTP servers do.
     */
-    directory = strdup( hc->expnfilename );
+    if (exefilename)
-    if ( directory == (char*) 0 )
+      binary = exefilename;
-	binary = hc->expnfilename;      /* ignore errors */
     else
-	{
+      {
+        directory = strdup( exefilename ? exefilename : hc->expnfilename );
+        if ( directory == (char*) 0 )
+            binary = exefilename;      /* ignore errors */
+        else
+            {
-	binary = strrchr( directory, '/' );
+            binary = strrchr( directory, '/' );
-	if ( binary == (char*) 0 )
+            if ( binary == (char*) 0 )
-	    binary = hc->expnfilename;
+                binary = exefilename;
-	else
+            else
-	    {
+                {
-	    *binary++ = '\0';
+                *binary++ = '\0';
-	    (void) chdir( directory );  /* ignore errors */
+                (void) chdir( directory );  /* ignore errors */
+                }
+            }
-	    }
+      }
-	}
     /* Default behavior for SIGPIPE. */
     (void) signal( SIGPIPE, SIG_DFL );
     /* Run the program. */
     exit( 1 );
     }
 static off_t
-cgi( httpd_conn* hc )
+cgi( httpd_conn* hc, char* exefilename )
     {
     int r;
     ClientData client_data;
     if ( hc->method == METHOD_GET || hc->method == METHOD_POST )
 	    return -1;
 	    }
 	if ( r == 0 )
 	    {
 	    unlisten( hc->hs );
-	    cgi_child( hc );
+	    cgi_child( hc, exefilename );
 	    }
 	/* Parent process. */
 	syslog( LOG_INFO, "spawned CGI process %d for file '%.200s'", r, hc->expnfilename );
 #ifdef CGI_TIMELIMIT
 #endif /* AUTH_FILE */
 	/* Referer check. */
 	if ( ! check_referer( hc ) )
 	    return -1;
 	/* Ok, generate an index. */
-	return ls( hc );
+	return hc->hs->autoindex_prog ? cgi( hc, hc->hs->autoindex_prog) : ls( hc );
 #else /* GENERATE_INDEXES */
 	syslog(
 	    LOG_INFO, "%.80s URL \"%.80s\" tried to index a directory",
 	    httpd_ntoa( &hc->client_addr ), hc->encodedurl );
 	httpd_send_err(
     /* Is it world-executable and in the CGI area? */
     if ( hc->hs->cgi_pattern != (char*) 0 &&
 	 ( hc->sb.st_mode & S_IXOTH ) &&
 	 match( hc->hs->cgi_pattern, hc->expnfilename ) )
-	return cgi( hc );
+	return cgi( hc, 0 );
     /* It's not CGI.  If it's executable or there's pathinfo, someone's
     ** trying to either serve or run a non-CGI file as CGI.   Either case
     ** is prohibited.
     */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing thttpd/libhttpd.c (file contents): Revision 1.1 by root, Mon Jun 18 21:11:56 2001 UTC vs. Revision 1.1.2.1 by root, Mon Jun 18 21:19:51 2001 UTC

Diff Legend

Comparing thttpd/libhttpd.c (file contents):
Revision 1.1 by root, Mon Jun 18 21:11:56 2001 UTC vs.
Revision 1.1.2.1 by root, Mon Jun 18 21:19:51 2001 UTC