Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | The merge at [dd9633a03d] did not work because of the bug just fixed. This change moves the changes that should have been in that merge into the main line of the tree. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
04f7535ee31e45fad8d3bc8f61e31397 |
| User & Date: | drh 2007-08-01 12:20:24.000 |
Context
|
2007-08-01
| ||
| 12:49 | Add the "leaves" webpage and the "branches" CLI command. We need to work on the nomenclature. ... (check-in: afcdc7ec97 user: drh tags: trunk) | |
| 12:20 | The merge at [dd9633a03d] did not work because of the bug just fixed. This change moves the changes that should have been in that merge into the main line of the tree. ... (check-in: 04f7535ee3 user: drh tags: trunk) | |
| 12:17 | Fix a problem in the commit logic that caused it to ignore merge changes. Add another test to the commit to detect future problems of a similar nature. ... (check-in: 5c3e87171a user: drh tags: trunk) | |
Changes
Changes to src/cgi.c.
| ︙ | ︙ | |||
999 1000 1001 1002 1003 1004 1005 |
}
cgi_setenv("REQUEST_URI", zToken);
for(i=0; zToken[i] && zToken[i]!='?'; i++){}
if( zToken[i] ) zToken[i++] = 0;
cgi_setenv("PATH_INFO", zToken);
cgi_setenv("QUERY_STRING", &zToken[i]);
if( getpeername(fileno(stdin), (struct sockaddr*)&remoteName, &size)>=0 ){
| > | > > > > > > | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 |
}
cgi_setenv("REQUEST_URI", zToken);
for(i=0; zToken[i] && zToken[i]!='?'; i++){}
if( zToken[i] ) zToken[i++] = 0;
cgi_setenv("PATH_INFO", zToken);
cgi_setenv("QUERY_STRING", &zToken[i]);
if( getpeername(fileno(stdin), (struct sockaddr*)&remoteName, &size)>=0 ){
char *zIpAddr = inet_ntoa(remoteName.sin_addr);
cgi_setenv("REMOTE_ADDR", zIpAddr);
/* Set the Global.zIpAddr variable to the server we are talking to.
** This is used to populate the ipaddr column of the rcvfrom table,
** if any files are received from the connected client.
*/
g.zIpAddr = mprintf("%s", zIpAddr);
}
/* Get all the optional fields that follow the first line.
*/
while( fgets(zLine,sizeof(zLine),stdin) ){
char *zFieldName;
char *zVal;
|
| ︙ | ︙ |
Changes to src/http.c.
| ︙ | ︙ | |||
59 60 61 62 63 64 65 66 67 68 69 70 71 72 |
}else
#endif
{
fossil_panic("can't resolve host name: %s\n", g.urlName);
}
}
addrIsInit = 1;
}
s = socket(AF_INET,SOCK_STREAM,0);
if( s<0 ){
fossil_panic("cannot create a socket");
}
if( connect(s,(struct sockaddr*)&addr,sizeof(addr))<0 ){
fossil_panic("cannot connect to host %s:%d", g.urlName, g.urlPort);
| > > > > > > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 |
}else
#endif
{
fossil_panic("can't resolve host name: %s\n", g.urlName);
}
}
addrIsInit = 1;
/* Set the Global.zIpAddr variable to the server we are talking to.
** This is used to populate the ipaddr column of the rcvfrom table,
** if any files are received from the server.
*/
g.zIpAddr = mprintf("%s", inet_ntoa(addr.sin_addr));
}
s = socket(AF_INET,SOCK_STREAM,0);
if( s<0 ){
fossil_panic("cannot create a socket");
}
if( connect(s,(struct sockaddr*)&addr,sizeof(addr))<0 ){
fossil_panic("cannot connect to host %s:%d", g.urlName, g.urlPort);
|
| ︙ | ︙ |