Diff
Not logged in

Differences From Artifact [fe6952198f]:

To Artifact [b985f3a756]:


208
209
210
211
212
213
214

215
216
217
218
219
220
221
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222







+







  int wikiFlags;          /* Wiki conversion flags applied to %W */
  char isHTTP;            /* True if server/CGI modes, else assume CLI. */
  char javascriptHyperlink; /* If true, set href= using script, not HTML */
  Blob httpHeader;        /* Complete text of the HTTP request header */
  UrlData url;            /* Information about current URL */
  const char *zLogin;     /* Login name.  NULL or "" if not logged in. */
  const char *zCkoutAlias;   /* doc/ uses this branch as an alias for "ckout" */
  const char *zMainMenuFile; /* --mainmenu FILE from server/ui/cgi */
  const char *zSSLIdentity;  /* Value of --ssl-identity option, filename of
                             ** SSL client identity */
#if defined(_WIN32) && USE_SEE
  const char *zPidKey;    /* Saved value of the --usepidkey option.  Only
                           * applicable when using SEE on Windows. */
#endif
  int useLocalauth;       /* No login required if from 127.0.0.1 */
2342
2343
2344
2345
2346
2347
2348
2349
2350


2351
2352
2353
2354
2355
2356
2357
2343
2344
2345
2346
2347
2348
2349


2350
2351
2352
2353
2354
2355
2356
2357
2358







-
-
+
+







    if( blob_eq(&key, "mainmenu:") && blob_token(&line, &value) ){
      /* mainmenu: FILENAME
      **
      ** Use the contents of FILENAME as the value of the site's
      ** "mainmenu" setting, overriding the contents (for this
      ** request) of the db-side setting or the hard-coded default.
      */
      style_default_mainmenu_override(blob_str(&value));
      blob_reset(&value);
      g.zMainMenuFile = blob_str(&value);
      value = empty_blob/*take over ownership*/;
      continue;
    }
    if( blob_eq(&key, "cgi-debug:") && blob_token(&line, &value) ){
      /* cgi-debug: FILENAME
      **
      ** Causes output from cgi_debug() and CGIDEBUG(()) calls to go
      ** into FILENAME.  Useful for debugging CGI configuration problems.
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2835
2836
2837
2838
2839
2840
2841

2842
2843
2844
2845
2846
2847
2848







-







#endif
  int allowRepoList;         /* List repositories on URL "/" */
  const char *zAltBase;      /* Argument to the --baseurl option */
  const char *zFileGlob;     /* Static content must match this */
  char *zIpAddr = 0;         /* Bind to this IP address */
  int fCreate = 0;           /* The --create flag */
  const char *zInitPage = 0; /* Start on this page.  --page option */
  const char *zMainMenu = 0; /* --mainmenu option */

#if defined(_WIN32)
  const char *zStopperFile;    /* Name of file used to terminate server */
  zStopperFile = find_option("stopper", 0, 1);
#endif

  if( g.zErrlog==0 ){
2883
2884
2885
2886
2887
2888
2889
2890
2891


2892
2893

2894
2895
2896
2897
2898
2899
2900
2901
2883
2884
2885
2886
2887
2888
2889


2890
2891


2892

2893
2894
2895
2896
2897
2898
2899







-
-
+
+
-
-
+
-







  if( find_option("https",0,0)!=0 ){
    cgi_replace_parameter("HTTPS","on");
  }
  if( find_option("localhost", 0, 0)!=0 ){
    flags |= HTTP_SERVER_LOCALHOST;
  }
  g.zCkoutAlias = find_option("ckout-alias",0,1);
  zMainMenu = find_option("mainmenu",0,1);
  if( zMainMenu!=0 ){
  g.zMainMenuFile = find_option("mainmenu",0,1);
  if( g.zMainMenuFile!=0 && file_size(g.zMainMenuFile,ExtFILE)<0 ){
    if(0!=style_default_mainmenu_override(zMainMenu)){
      fossil_fatal("Cannot read --mainmenu file %s", zMainMenu);
    fossil_fatal("Cannot read --mainmenu file %s", g.zMainMenuFile);
    }
  }
  /* We should be done with options.. */
  verify_all_options();

  if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
  if( isUiCmd ){
    flags |= HTTP_SERVER_LOCALHOST|HTTP_SERVER_REPOLIST;