Differences From:

File src/main.c part of check-in [b2e55c0d4d] - Add the /wiki and /bwiki web pages. Currently renders content from the check-out as readonly. by drh on 2007-09-01 21:11:33. Also file src/main.c part of check-in [bbcb6326c9] - Pulled in the navbar and timeline changes. by aku on 2007-09-17 00:58:51. [view]

To:

File src/main.c part of check-in [929d28e358] - Added the "e" capability for viewing ticket submitter email addresses. Additional tinkering toward the design of tickets. This check-in is only thinly tested. by drh on 2007-11-05 02:42:58. Also file src/main.c part of check-in [d0305b305a] - Merged mainline into my branch to get the newest application. by aku on 2007-12-05 08:07:46. [view]

@@ -60,8 +60,9 @@
   int fHttpTrace;         /* Trace outbound HTTP requests */
   char *zPath;            /* Name of webpage being served */
   char *zExtra;           /* Extra path information past the webpage name */
   char *zBaseURL;         /* Full text of the URL being served */
+  char *zTop;             /* Parent directory of zPath */
   const char *zContentType;  /* The content type of the input HTTP request */
   int iErrPriority;       /* Priority of current error message */
   char *zErrMsg;          /* Text of an error message */
   Blob cgiIn;             /* Input to an xfer www method */
@@ -103,8 +104,9 @@
   int okRdTkt;            /* r: view tickets via web */
   int okNewTkt;           /* n: create new tickets */
   int okApndTkt;          /* c: append to tickets via the web */
   int okWrTkt;            /* w: make changes to tickets via web */
+  int okRdAddr;           /* e: read email addresses on tickets */
 
   FILE *fDebug;           /* Write debug information here, if the file exists */
 };
 
@@ -386,9 +388,9 @@
   const char *z;
   if( g.argc!=3 ){
     printf("Usage: %s help COMMAND.\nAvailable COMMANDs:\n", g.argv[0]);
     cmd_cmd_list();
-    printf("You are running fossil baseline " MANIFEST_UUID "\n");
+    printf("This is fossil version " MANIFEST_VERSION " " MANIFEST_DATE "\n");
     return;
   }
   rc = name_search(g.argv[2], aCommand, count(aCommand), &idx);
   if( rc==1 ){
@@ -413,13 +415,13 @@
   putchar('\n');
 }
 
 /*
-** RSS feeds need to reference absolute URLs so we need to calculate
-** the base URL onto which we add components. This is basically
-** cgi_redirect() stripped down and always returning an absolute URL.
+** Set the g.zBaseURL value to the full URL for the toplevel of
+** the fossil tree.  Set g.zHomeURL to g.zBaseURL without the
+** leading "http://" and the host and port.
 */
-static char *get_base_url(void){
+void set_base_url(void){
   int i;
   const char *zHost = PD("HTTP_HOST","");
   const char *zMode = PD("HTTPS","off");
   const char *zCur = PD("REQUEST_URI","/");
@@ -437,17 +439,20 @@
   while( i>0 && zCur[i-1]!='/' ){ i--; }
   while( i>0 && zCur[i-1]=='/' ){ i--; }
 
   if( strcmp(zMode,"on")==0 ){
-    return mprintf("https://%s%.*s", zHost, i, zCur);
-  }
-  return mprintf("http://%s%.*s", zHost, i, zCur);
+    g.zBaseURL = mprintf("https://%s%.*s", zHost, i, zCur);
+    g.zTop = &g.zBaseURL[8+strlen(zHost)];
+  }else{
+    g.zBaseURL = mprintf("http://%s%.*s", zHost, i, zCur);
+    g.zTop = &g.zBaseURL[7+strlen(zHost)];
+  }
 }
 
 /*
 ** Preconditions:
 **
-**    * Environment various are set up according to the CGI standard.
+**    * Environment variables are set up according to the CGI standard.
 **    * The respository database has been located and opened.
 **
 ** Process the webpage specified by the PATH_INFO or REQUEST_URI
 ** environment variable.
@@ -463,16 +468,12 @@
   */
   zPathInfo = P("PATH_INFO");
   if( zPathInfo==0 || zPathInfo[0]==0 ){
     const char *zUri;
-    char *zBase;
     zUri = PD("REQUEST_URI","/");
     for(i=0; zUri[i] && zUri[i]!='?' && zUri[i]!='#'; i++){}
     for(j=i; j>0 && zUri[j-1]!='/'; j--){}
-    zBase = mprintf("%.*s/index", i-j, &zUri[j]);
-    cgi_redirect(zBase);
-    cgi_reply();
-    return;
+    cgi_redirectf("%.*s/index", i, zUri);
   }else{
     zPath = mprintf("%s", zPathInfo);
   }
 
@@ -482,17 +483,19 @@
   for(i=1; zPath[i] && zPath[i]!='/'; i++){}
   if( zPath[i]=='/' ){
     zPath[i] = 0;
     g.zExtra = &zPath[i+1];
-
+  }else{
+    g.zExtra = 0;
+  }
+  set_base_url();
+  if( g.zExtra ){
     /* CGI parameters get this treatment elsewhere, but places like getfile
     ** will use g.zExtra directly.
     */
     dehttpize(g.zExtra);
-  }else{
-    g.zExtra = 0;
-  }
-  g.zBaseURL = get_base_url();
+    cgi_set_parameter_nocopy("name", g.zExtra);
+  }
 
   /* Prevent robots from indexing this site.
   */
   if( strcmp(g.zPath, "robots.txt")==0 ){
@@ -596,8 +599,17 @@
     db_must_be_within_tree();
   }
   cgi_handle_http_request();
   process_one_web_page();
+}
+
+/*
+** COMMAND: test-http
+** Works like the http command but gives setup permission to all users.
+*/
+void cmd_test_http(void){
+  login_set_capabilities("s");
+  cmd_http();
 }
 
 /*
 ** COMMAND: server