Fossil SCM

Unify use of the user-agent string.

mistachkin 2013-12-13 21:46 UTC tkt-change-hook
Commit 55c91af5ade4aa64482fae081269d2f52ad2fd7e
Parent a60d2976ff922a0…
3 files changed +1 -2 +10 +1 -2
~ src/http.c ~ src/main.c ~ src/th_main.c
M src/http.c
+1 -2
--- src/http.c
+++ src/http.c
@@ -110,12 +110,11 @@
110110
 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111111
 fossil_free(zEncoded);
112112
 fossil_free(zCredentials);
113113
 }
114114
 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115
- blob_appendf(pHdr, "User-Agent: Fossil/" RELEASE_VERSION
116
- " (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
115
+ blob_appendf(pHdr, "User-Agent: %s\r\n", get_user_agent());
117116
 if( g.urlIsSsh ) blob_appendf(pHdr, "X-Fossil-Transport: SSH\r\n");
118117
 if( g.fHttpTrace ){
119118
 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
120119
 }else{
121120
 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
122121
--- src/http.c
+++ src/http.c
@@ -110,12 +110,11 @@
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111 fossil_free(zEncoded);
112 fossil_free(zCredentials);
113 }
114 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115 blob_appendf(pHdr, "User-Agent: Fossil/" RELEASE_VERSION
116 " (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
117 if( g.urlIsSsh ) blob_appendf(pHdr, "X-Fossil-Transport: SSH\r\n");
118 if( g.fHttpTrace ){
119 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
120 }else{
121 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
122
--- src/http.c
+++ src/http.c
@@ -110,12 +110,11 @@
110 blob_appendf(pHdr, "Authorization: Basic %s\r\n", zEncoded);
111 fossil_free(zEncoded);
112 fossil_free(zCredentials);
113 }
114 blob_appendf(pHdr, "Host: %s\r\n", g.urlHostname);
115 blob_appendf(pHdr, "User-Agent: %s\r\n", get_user_agent());
 
116 if( g.urlIsSsh ) blob_appendf(pHdr, "X-Fossil-Transport: SSH\r\n");
117 if( g.fHttpTrace ){
118 blob_appendf(pHdr, "Content-Type: application/x-fossil-debug\r\n");
119 }else{
120 blob_appendf(pHdr, "Content-Type: application/x-fossil\r\n");
121
M src/main.c
+10
--- src/main.c
+++ src/main.c
@@ -837,10 +837,20 @@
837837
 const char *get_version(){
838838
 static const char version[] = RELEASE_VERSION " " MANIFEST_VERSION " "
839839
 MANIFEST_DATE " UTC";
840840
 return version;
841841
 }
842
+
843
+/*
844
+** This function returns the user-agent string for Fossil, for
845
+** use in HTTP(S) requests.
846
+*/
847
+const char *get_user_agent(){
848
+ static const char version[] = "Fossil/" RELEASE_VERSION " (" MANIFEST_DATE
849
+ " " MANIFEST_VERSION ")";
850
+ return version;
851
+}
842852
843853
 /*
844854
 ** COMMAND: version
845855
 **
846856
 ** Usage: %fossil version ?-verbose|-v?
847857
--- src/main.c
+++ src/main.c
@@ -837,10 +837,20 @@
837 const char *get_version(){
838 static const char version[] = RELEASE_VERSION " " MANIFEST_VERSION " "
839 MANIFEST_DATE " UTC";
840 return version;
841 }
 
 
 
 
 
 
 
 
 
 
842
843 /*
844 ** COMMAND: version
845 **
846 ** Usage: %fossil version ?-verbose|-v?
847
--- src/main.c
+++ src/main.c
@@ -837,10 +837,20 @@
837 const char *get_version(){
838 static const char version[] = RELEASE_VERSION " " MANIFEST_VERSION " "
839 MANIFEST_DATE " UTC";
840 return version;
841 }
842
843 /*
844 ** This function returns the user-agent string for Fossil, for
845 ** use in HTTP(S) requests.
846 */
847 const char *get_user_agent(){
848 static const char version[] = "Fossil/" RELEASE_VERSION " (" MANIFEST_DATE
849 " " MANIFEST_VERSION ")";
850 return version;
851 }
852
853 /*
854 ** COMMAND: version
855 **
856 ** Usage: %fossil version ?-verbose|-v?
857
M src/th_main.c
+1 -2
--- src/th_main.c
+++ src/th_main.c
@@ -914,12 +914,11 @@
914914
 blob_appendf(&hdr, "Authorization: Basic %s\r\n", zEncoded);
915915
 fossil_free(zEncoded);
916916
 fossil_free(zCredentials);
917917
 }
918918
 blob_appendf(&hdr, "Host: %s\r\n"
919
- "User-Agent: Fossil/" RELEASE_VERSION " (" MANIFEST_DATE
920
- " " MANIFEST_VERSION ")\r\n", urlData.hostname);
919
+ "User-Agent: %s\r\n", urlData.hostname, get_user_agent());
921920
 if( zType[0]=='P' ){
922921
 blob_appendf(&hdr, "Content-Type: application/x-www-form-urlencoded\r\n"
923922
 "Content-Length: %d\r\n\r\n", blob_size(&payload));
924923
 }else{
925924
 blob_appendf(&hdr, "\r\n");
926925
--- src/th_main.c
+++ src/th_main.c
@@ -914,12 +914,11 @@
914 blob_appendf(&hdr, "Authorization: Basic %s\r\n", zEncoded);
915 fossil_free(zEncoded);
916 fossil_free(zCredentials);
917 }
918 blob_appendf(&hdr, "Host: %s\r\n"
919 "User-Agent: Fossil/" RELEASE_VERSION " (" MANIFEST_DATE
920 " " MANIFEST_VERSION ")\r\n", urlData.hostname);
921 if( zType[0]=='P' ){
922 blob_appendf(&hdr, "Content-Type: application/x-www-form-urlencoded\r\n"
923 "Content-Length: %d\r\n\r\n", blob_size(&payload));
924 }else{
925 blob_appendf(&hdr, "\r\n");
926
--- src/th_main.c
+++ src/th_main.c
@@ -914,12 +914,11 @@
914 blob_appendf(&hdr, "Authorization: Basic %s\r\n", zEncoded);
915 fossil_free(zEncoded);
916 fossil_free(zCredentials);
917 }
918 blob_appendf(&hdr, "Host: %s\r\n"
919 "User-Agent: %s\r\n", urlData.hostname, get_user_agent());
 
920 if( zType[0]=='P' ){
921 blob_appendf(&hdr, "Content-Type: application/x-www-form-urlencoded\r\n"
922 "Content-Length: %d\r\n\r\n", blob_size(&payload));
923 }else{
924 blob_appendf(&hdr, "\r\n");
925

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button