Index: client/clinet.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v retrieving revision 1.39 diff -u -r1.39 clinet.c --- client/clinet.c 2001/08/07 13:53:09 1.39 +++ client/clinet.c 2001/08/16 18:28:41 @@ -306,26 +306,25 @@ my_closesocket(s); return NULL; } - + my_snprintf(str,sizeof(str), + "GET %s%s%s HTTP/1.0\r\nUser-Agent: Freeciv/%s %s\r\n\r\n", + proxy_url ? "" : "/", + urlpath, + proxy_url ? metaserver : "", + VERSION_STRING, + get_client_string()); #ifdef HAVE_FDOPEN f=fdopen(s,"r+"); - fprintf(f,"GET %s%s%s HTTP/1.0\r\n\r\n", - proxy_url ? "" : "/", - urlpath, - proxy_url ? metaserver : ""); + fwrite(str,1,strlen(str),f); fflush(f); #else { int i; f=tmpfile(); - send(s,"GET ",4,0); - if(!proxy_url) send(s,"/",1,0); - send(s,urlpath,strlen(urlpath),0); - if(proxy_url) send(s,metaserver,strlen(metaserver),0); - send(s," HTTP/1.0\r\n\r\n", sizeof(" HTTP/1.0\r\n\r\n"),0); + my_writesocket(s,str,strlen(str)); - while ((i = recv(s, str, sizeof(str), 0)) > 0) + while ((i = my_readsocket(s, str, sizeof(str))) > 0) fwrite(str,1,i,f); fflush(f); Index: client/gui-beos/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-beos/gui_main.c,v retrieving revision 1.2 diff -u -r1.2 gui_main.c --- client/gui-beos/gui_main.c 2000/07/04 23:29:39 1.2 +++ client/gui-beos/gui_main.c 2001/08/16 18:28:41 @@ -35,3 +35,9 @@ { /* NOT_FINISHED( "sound_bell" ); */ } + +char *get_client_string(void) +{ + return CLIENT_STRING; +} + Index: client/gui-beos/gui_main.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-beos/gui_main.h,v retrieving revision 1.1 diff -u -r1.1 gui_main.h --- client/gui-beos/gui_main.h 2000/06/19 23:28:10 1.1 +++ client/gui-beos/gui_main.h 2001/08/16 18:28:41 @@ -1,5 +1,7 @@ /* gui_main.h */ +#define CLIENT_STRING "gui-beos" + #ifdef __cplusplus extern "C" { #endif Index: client/gui-gtk/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/gui_main.c,v retrieving revision 1.87 diff -u -r1.87 gui_main.c --- client/gui-gtk/gui_main.c 2001/08/14 13:16:16 1.87 +++ client/gui-gtk/gui_main.c 2001/08/16 18:28:41 @@ -1029,3 +1029,8 @@ showing = 0; } } + +char *get_client_string(void) +{ + return CLIENT_STRING; +} Index: client/gui-gtk/gui_main.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/gui_main.h,v retrieving revision 1.5 diff -u -r1.5 gui_main.h --- client/gui-gtk/gui_main.h 2001/04/21 22:37:45 1.5 +++ client/gui-gtk/gui_main.h 2001/08/16 18:28:41 @@ -13,6 +13,8 @@ #ifndef FC__GUI_MAIN_H #define FC__GUI_MAIN_H +#define CLIENT_STRING "gui-gtk" + #include #include "gui_main_g.h" Index: client/gui-mui/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gui_main.c,v retrieving revision 1.53 diff -u -r1.53 gui_main.c --- client/gui-mui/gui_main.c 2001/08/05 14:44:58 1.53 +++ client/gui-mui/gui_main.c 2001/08/16 18:28:45 @@ -1481,3 +1481,9 @@ void set_unit_icons_more_arrow(int onoff) { } + +char *get_client_string(void) +{ + return CLIENT_STRING; +} + Index: client/gui-mui/gui_main.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gui_main.h,v retrieving revision 1.15 diff -u -r1.15 gui_main.h --- client/gui-mui/gui_main.h 2001/02/25 12:14:41 1.15 +++ client/gui-mui/gui_main.h 2001/08/16 18:28:45 @@ -13,6 +13,8 @@ #ifndef FC__GUI_MAIN_H #define FC__GUI_MAIN_H +#define CLIENT_STRING "gui-mui" + #include "gui_main_g.h" #define COPYRIGHTSTRING "©1999-2000 by Sebastian Bauer" Index: client/gui-stub/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-stub/gui_main.c,v retrieving revision 1.3 diff -u -r1.3 gui_main.c --- client/gui-stub/gui_main.c 2000/07/10 06:31:23 1.3 +++ client/gui-stub/gui_main.c 2001/08/16 18:28:45 @@ -47,3 +47,9 @@ { /* PORTME */ } + +char *get_client_string(void) +{ + return CLIENT_STRING; +} + Index: client/gui-stub/gui_main.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-stub/gui_main.h,v retrieving revision 1.1 diff -u -r1.1 gui_main.h --- client/gui-stub/gui_main.h 1999/12/27 17:25:09 1.1 +++ client/gui-stub/gui_main.h 2001/08/16 18:28:45 @@ -2,6 +2,8 @@ #ifndef FC__GUI_MAIN_H #define FC__GUI_MAIN_H +#define CLIENT_STRING "gui-stub" + #include "gui_main_g.h" Index: client/gui-xaw/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/gui_main.c,v retrieving revision 1.55 diff -u -r1.55 gui_main.c --- client/gui-xaw/gui_main.c 2001/01/30 23:38:53 1.55 +++ client/gui-xaw/gui_main.c 2001/08/16 18:28:45 @@ -867,3 +867,8 @@ showing = 0; } } + +char *get_client_string(void) +{ + return CLIENT_STRING; +} Index: client/gui-xaw/gui_main.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/gui_main.h,v retrieving revision 1.8 diff -u -r1.8 gui_main.h --- client/gui-xaw/gui_main.h 2001/01/30 23:38:53 1.8 +++ client/gui-xaw/gui_main.h 2001/08/16 18:28:45 @@ -13,6 +13,8 @@ #ifndef FC__GUI_MAIN_H #define FC__GUI_MAIN_H +#define CLIENT_STRING "gui-xaw" + #include #include "gui_main_g.h" Index: client/include/gui_main_g.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/gui_main_g.h,v retrieving revision 1.4 diff -u -r1.4 gui_main_g.h --- client/include/gui_main_g.h 2000/07/10 06:31:25 1.4 +++ client/include/gui_main_g.h 2001/08/16 18:28:45 @@ -21,6 +21,8 @@ void add_net_input(int); void remove_net_input(void); +char *get_client_string(void); + void set_unit_icon(int idx, struct unit *punit); void set_unit_icons_more_arrow(int onoff);