Fossil SCM
merged trunk changes
Commit
a2d5230d24b9f1759c8a1ad95ab963b8a3a2cec2
Parent
bdd92802d0739ff…
5 files changed
+2
-2
+2
-2
+1
-1
+2
-2
+8
-5
+2
-2
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -16,13 +16,13 @@ | ||
| 16 | 16 | ******************************************************************************* |
| 17 | 17 | ** |
| 18 | 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | 19 | ** for windows. |
| 20 | 20 | */ |
| 21 | -#if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) | |
| 22 | -/* This code is for win32 only */ | |
| 23 | 21 | #include "config.h" |
| 22 | +#ifdef _WIN32 | |
| 23 | +/* This code is for win32 only */ | |
| 24 | 24 | #include "winhttp.h" |
| 25 | 25 | #include <windows.h> |
| 26 | 26 | |
| 27 | 27 | /* |
| 28 | 28 | ** The HttpRequest structure holds information about each incoming |
| 29 | 29 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -16,13 +16,13 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | ** for windows. |
| 20 | */ |
| 21 | #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) |
| 22 | /* This code is for win32 only */ |
| 23 | #include "config.h" |
| 24 | #include "winhttp.h" |
| 25 | #include <windows.h> |
| 26 | |
| 27 | /* |
| 28 | ** The HttpRequest structure holds information about each incoming |
| 29 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -16,13 +16,13 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | ** for windows. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #ifdef _WIN32 |
| 23 | /* This code is for win32 only */ |
| 24 | #include "winhttp.h" |
| 25 | #include <windows.h> |
| 26 | |
| 27 | /* |
| 28 | ** The HttpRequest structure holds information about each incoming |
| 29 |
+2
-2
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -16,13 +16,13 @@ | ||
| 16 | 16 | ******************************************************************************* |
| 17 | 17 | ** |
| 18 | 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | 19 | ** for windows. |
| 20 | 20 | */ |
| 21 | -#if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) | |
| 22 | -/* This code is for win32 only */ | |
| 23 | 21 | #include "config.h" |
| 22 | +#ifdef _WIN32 | |
| 23 | +/* This code is for win32 only */ | |
| 24 | 24 | #include "winhttp.h" |
| 25 | 25 | #include <windows.h> |
| 26 | 26 | |
| 27 | 27 | /* |
| 28 | 28 | ** The HttpRequest structure holds information about each incoming |
| 29 | 29 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -16,13 +16,13 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | ** for windows. |
| 20 | */ |
| 21 | #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) |
| 22 | /* This code is for win32 only */ |
| 23 | #include "config.h" |
| 24 | #include "winhttp.h" |
| 25 | #include <windows.h> |
| 26 | |
| 27 | /* |
| 28 | ** The HttpRequest structure holds information about each incoming |
| 29 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -16,13 +16,13 @@ | |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file implements a very simple (and low-performance) HTTP server |
| 19 | ** for windows. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #ifdef _WIN32 |
| 23 | /* This code is for win32 only */ |
| 24 | #include "winhttp.h" |
| 25 | #include <windows.h> |
| 26 | |
| 27 | /* |
| 28 | ** The HttpRequest structure holds information about each incoming |
| 29 |
+1
-1
| --- www/index.wiki | ||
| +++ www/index.wiki | ||
| @@ -88,11 +88,11 @@ | ||
| 88 | 88 | 7. <b>Robust & Reliable</b> - |
| 89 | 89 | Fossil stores content using an [./fileformat.wiki | enduring file format] |
| 90 | 90 | in an SQLite database so that transactions are |
| 91 | 91 | atomic even if interrupted by a power loss or system crash. Furthermore, |
| 92 | 92 | automatic [./selfcheck.wiki | self-checks] verify that all aspects of |
| 93 | - the repository are consistent prior to each commit. In nearly three years | |
| 93 | + the repository are consistent prior to each commit. In over three years | |
| 94 | 94 | of operation, no work has ever been lost after having been committed to |
| 95 | 95 | a Fossil repository. |
| 96 | 96 | |
| 97 | 97 | <hr> |
| 98 | 98 | <h3>Links For Fossil Users:</h3> |
| 99 | 99 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -88,11 +88,11 @@ | |
| 88 | 7. <b>Robust & Reliable</b> - |
| 89 | Fossil stores content using an [./fileformat.wiki | enduring file format] |
| 90 | in an SQLite database so that transactions are |
| 91 | atomic even if interrupted by a power loss or system crash. Furthermore, |
| 92 | automatic [./selfcheck.wiki | self-checks] verify that all aspects of |
| 93 | the repository are consistent prior to each commit. In nearly three years |
| 94 | of operation, no work has ever been lost after having been committed to |
| 95 | a Fossil repository. |
| 96 | |
| 97 | <hr> |
| 98 | <h3>Links For Fossil Users:</h3> |
| 99 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -88,11 +88,11 @@ | |
| 88 | 7. <b>Robust & Reliable</b> - |
| 89 | Fossil stores content using an [./fileformat.wiki | enduring file format] |
| 90 | in an SQLite database so that transactions are |
| 91 | atomic even if interrupted by a power loss or system crash. Furthermore, |
| 92 | automatic [./selfcheck.wiki | self-checks] verify that all aspects of |
| 93 | the repository are consistent prior to each commit. In over three years |
| 94 | of operation, no work has ever been lost after having been committed to |
| 95 | a Fossil repository. |
| 96 | |
| 97 | <hr> |
| 98 | <h3>Links For Fossil Users:</h3> |
| 99 |
+2
-2
| --- www/password.wiki | ||
| +++ www/password.wiki | ||
| @@ -60,20 +60,20 @@ | ||
| 60 | 60 | the web interface or direct SQL manipulation of the USER table. |
| 61 | 61 | Note also that the password field is |
| 62 | 62 | essentially ignored for the special users named "anonymous", "developer", |
| 63 | 63 | "reader", and "nobody". It is not possible to authenticate as users |
| 64 | 64 | "developer", "reader", or "nobody" and the authentication protocol |
| 65 | -for "anonymous" use one-time captchas not persistent passwords. | |
| 65 | +for "anonymous" uses one-time captchas not persistent passwords. | |
| 66 | 66 | |
| 67 | 67 | <h2>Web Interface Authentication</h2> |
| 68 | 68 | |
| 69 | 69 | When a user logs into Fossil using the web interface, the login name |
| 70 | 70 | and password are sent in the clear to the server. The server then |
| 71 | 71 | hashes the password and compares it against the value stored in USER.PW. |
| 72 | 72 | If they match, the server sets a cookie on the client to record the |
| 73 | 73 | login. This cookie contains a large amount of high-quality randomness |
| 74 | -and is thus impossible to guess. The value of the cookie and the IP | |
| 74 | +and is thus intractable to guess. The value of the cookie and the IP | |
| 75 | 75 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 76 | 76 | of the USER table on the server. |
| 77 | 77 | The USER.CEXPIRE field holds an expiration date |
| 78 | 78 | for the cookie, encoded as a julian day number. On all subsequent |
| 79 | 79 | HTTP requests, the cookie value is matched against the USER table to |
| 80 | 80 |
| --- www/password.wiki | |
| +++ www/password.wiki | |
| @@ -60,20 +60,20 @@ | |
| 60 | the web interface or direct SQL manipulation of the USER table. |
| 61 | Note also that the password field is |
| 62 | essentially ignored for the special users named "anonymous", "developer", |
| 63 | "reader", and "nobody". It is not possible to authenticate as users |
| 64 | "developer", "reader", or "nobody" and the authentication protocol |
| 65 | for "anonymous" use one-time captchas not persistent passwords. |
| 66 | |
| 67 | <h2>Web Interface Authentication</h2> |
| 68 | |
| 69 | When a user logs into Fossil using the web interface, the login name |
| 70 | and password are sent in the clear to the server. The server then |
| 71 | hashes the password and compares it against the value stored in USER.PW. |
| 72 | If they match, the server sets a cookie on the client to record the |
| 73 | login. This cookie contains a large amount of high-quality randomness |
| 74 | and is thus impossible to guess. The value of the cookie and the IP |
| 75 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 76 | of the USER table on the server. |
| 77 | The USER.CEXPIRE field holds an expiration date |
| 78 | for the cookie, encoded as a julian day number. On all subsequent |
| 79 | HTTP requests, the cookie value is matched against the USER table to |
| 80 |
| --- www/password.wiki | |
| +++ www/password.wiki | |
| @@ -60,20 +60,20 @@ | |
| 60 | the web interface or direct SQL manipulation of the USER table. |
| 61 | Note also that the password field is |
| 62 | essentially ignored for the special users named "anonymous", "developer", |
| 63 | "reader", and "nobody". It is not possible to authenticate as users |
| 64 | "developer", "reader", or "nobody" and the authentication protocol |
| 65 | for "anonymous" uses one-time captchas not persistent passwords. |
| 66 | |
| 67 | <h2>Web Interface Authentication</h2> |
| 68 | |
| 69 | When a user logs into Fossil using the web interface, the login name |
| 70 | and password are sent in the clear to the server. The server then |
| 71 | hashes the password and compares it against the value stored in USER.PW. |
| 72 | If they match, the server sets a cookie on the client to record the |
| 73 | login. This cookie contains a large amount of high-quality randomness |
| 74 | and is thus intractable to guess. The value of the cookie and the IP |
| 75 | address of the client is stored in the USER.COOKIE and USER.IPADDR fields |
| 76 | of the USER table on the server. |
| 77 | The USER.CEXPIRE field holds an expiration date |
| 78 | for the cookie, encoded as a julian day number. On all subsequent |
| 79 | HTTP requests, the cookie value is matched against the USER table to |
| 80 |
+8
-5
| --- www/quickstart.wiki | ||
| +++ www/quickstart.wiki | ||
| @@ -232,16 +232,19 @@ | ||
| 232 | 232 | |
| 233 | 233 | <blockquote> |
| 234 | 234 | <b>fossil ui</b> <i>repository-filename</i> |
| 235 | 235 | </blockquote> |
| 236 | 236 | |
| 237 | - <p>The difference between these two command is that <b>ui</b> | |
| 238 | - attempts to automatically start your web browser pointing at the | |
| 239 | - server whereas <b>server</b> does not. | |
| 237 | + <p>The <b>ui</b> command is intended for accessing the web interface | |
| 238 | + from a local desktop. The <b>ui</b> command binds to the loopback IP | |
| 239 | + address only (and is thus makes the web interface visible only on the | |
| 240 | + local machine) and it automatically start your web browser pointing at the | |
| 241 | + server. For cross-machine collaboration, use the <b>server</b> command, | |
| 242 | + which binds on all IP addresses and does not try to start a web browser. | |
| 240 | 243 | You can omit the <i>repository-filename</i> if you are within |
| 241 | - a checked-out local tree. This server uses port 8080 by default | |
| 242 | - but you can specify a different port using the <b>-port</b> command.</p> | |
| 244 | + a checked-out local tree. The <b>server</b> uses port 8080 by default | |
| 245 | + but you can specify a different port using the <b>-port</b> option.</p> | |
| 243 | 246 | |
| 244 | 247 | <p>Command-line servers like this are useful when two people want |
| 245 | 248 | to share a repository on temporary or ad-hoc basis. For a more |
| 246 | 249 | permanent installation, you should use either the CGI server or the |
| 247 | 250 | inetd server. |
| 248 | 251 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -232,16 +232,19 @@ | |
| 232 | |
| 233 | <blockquote> |
| 234 | <b>fossil ui</b> <i>repository-filename</i> |
| 235 | </blockquote> |
| 236 | |
| 237 | <p>The difference between these two command is that <b>ui</b> |
| 238 | attempts to automatically start your web browser pointing at the |
| 239 | server whereas <b>server</b> does not. |
| 240 | You can omit the <i>repository-filename</i> if you are within |
| 241 | a checked-out local tree. This server uses port 8080 by default |
| 242 | but you can specify a different port using the <b>-port</b> command.</p> |
| 243 | |
| 244 | <p>Command-line servers like this are useful when two people want |
| 245 | to share a repository on temporary or ad-hoc basis. For a more |
| 246 | permanent installation, you should use either the CGI server or the |
| 247 | inetd server. |
| 248 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -232,16 +232,19 @@ | |
| 232 | |
| 233 | <blockquote> |
| 234 | <b>fossil ui</b> <i>repository-filename</i> |
| 235 | </blockquote> |
| 236 | |
| 237 | <p>The <b>ui</b> command is intended for accessing the web interface |
| 238 | from a local desktop. The <b>ui</b> command binds to the loopback IP |
| 239 | address only (and is thus makes the web interface visible only on the |
| 240 | local machine) and it automatically start your web browser pointing at the |
| 241 | server. For cross-machine collaboration, use the <b>server</b> command, |
| 242 | which binds on all IP addresses and does not try to start a web browser. |
| 243 | You can omit the <i>repository-filename</i> if you are within |
| 244 | a checked-out local tree. The <b>server</b> uses port 8080 by default |
| 245 | but you can specify a different port using the <b>-port</b> option.</p> |
| 246 | |
| 247 | <p>Command-line servers like this are useful when two people want |
| 248 | to share a repository on temporary or ad-hoc basis. For a more |
| 249 | permanent installation, you should use either the CGI server or the |
| 250 | inetd server. |
| 251 |