tidy-up: spelling WebSockets

Closes #14646

diff --git a/configure.ac b/configure.ac
index b4b788708c5151a24a7f4056bffbfd43fa4113a0..58ab9ae2f9bbd4257f6d4d9e1f146107310bd45a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4846,16 +4846,16 @@ AS_HELP_STRING([--disable-websockets],[Disable WebSockets support]),
     if test ${ac_cv_sizeof_curl_off_t} -gt 4; then
       AC_MSG_RESULT(yes)
       curl_ws_msg="enabled"
-      AC_DEFINE_UNQUOTED(USE_WEBSOCKETS, [1], [enable websockets support])
+      AC_DEFINE_UNQUOTED(USE_WEBSOCKETS, [1], [enable WebSockets support])
       SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS WS"
       if test "x$SSL_ENABLED" = "x1"; then
         SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS WSS"
       fi
-      experimental="$experimental Websockets"
+      experimental="$experimental WebSockets"
     else
-      dnl websockets requires >32 bit curl_off_t
+      dnl WebSockets requires >32 bit curl_off_t
       AC_MSG_RESULT(no)
-      AC_MSG_WARN([Websockets disabled due to lack of >32 bit curl_off_t])
+      AC_MSG_WARN([WebSockets disabled due to lack of >32 bit curl_off_t])
     fi
     ;;
   esac ],

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 840c2864cb03a0a8a698c24e0395d7387e675e60..2890d05e1ae2a209bf78bd0e54f1a792c0752739 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -2203,7 +2203,7 @@ typedef enum {
   /* specify which protocols that libcurl is allowed to follow directs to */
   CURLOPT(CURLOPT_REDIR_PROTOCOLS_STR, CURLOPTTYPE_STRINGPOINT, 319),
 
-  /* websockets options */
+  /* WebSockets options */
   CURLOPT(CURLOPT_WS_OPTIONS, CURLOPTTYPE_LONG, 320),
 
   /* CA cache timeout */

diff --git a/lib/http.c b/lib/http.c
index 6b2755d74f4303db527edb38d42bd5ac44df89ad..687b87436c3a5f25ab87e2ce1e4c506ad8268ae7 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -3535,7 +3535,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
 #endif
 
 #ifdef USE_WEBSOCKETS
-  /* All >=200 HTTP status codes are errors when wanting websockets */
+  /* All >=200 HTTP status codes are errors when wanting WebSockets */
   if(data->req.upgr101 == UPGR101_WS) {
     failf(data, "Refused WebSockets upgrade: %d", k->httpcode);
     result = CURLE_HTTP_RETURNED_ERROR;

diff --git a/lib/ws.c b/lib/ws.c
index 9f80fec9f057b778bfa3e8ce87a288bed964ade3..c845f5d3e12ca079b5cca2591f177d7b07cdb134 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -1276,7 +1276,7 @@ static void ws_free(struct connectdata *conn)
 static CURLcode ws_setup_conn(struct Curl_easy *data,
                               struct connectdata *conn)
 {
-  /* websockets is 1.1 only (for now) */
+  /* WebSockets is 1.1 only (for now) */
   data->state.httpwant = CURL_HTTP_VERSION_1_1;
   return Curl_http_setup_conn(data, conn);
 }

diff --git a/tests/http/clients/ws-data.c b/tests/http/clients/ws-data.c
index d045c5d2cb01bb88c91616463c6633fd354e2dde..ee067dd96edab4ddd43d130092c3933dd4984ec3 100644 (file)
--- a/tests/http/clients/ws-data.c
+++ b/tests/http/clients/ws-data.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 /* <DESC>
- * Websockets data echos
+ * WebSockets data echos
  * </DESC>
  */
 /* curl stuff */
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
 #else /* USE_WEBSOCKETS */
   (void)argc;
   (void)argv;
-  fprintf(stderr, "websockets not enabled in libcurl\n");
+  fprintf(stderr, "WebSockets not enabled in libcurl\n");
   return 1;
 #endif /* !USE_WEBSOCKETS */
 }

diff --git a/tests/http/clients/ws-pingpong.c b/tests/http/clients/ws-pingpong.c
index c86d7daed88e72a9d5daa3e0434e3d977b956856..4b57e21e85a556b999ec897c2bd64087ce3fe420 100644 (file)
--- a/tests/http/clients/ws-pingpong.c
+++ b/tests/http/clients/ws-pingpong.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 /* <DESC>
- * Websockets pingpong
+ * WebSockets pingpong
  * </DESC>
  */
 /* curl stuff */
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
 #else /* USE_WEBSOCKETS */
   (void)argc;
   (void)argv;
-  fprintf(stderr, "websockets not enabled in libcurl\n");
+  fprintf(stderr, "WebSockets not enabled in libcurl\n");
   return 1;
 #endif /* !USE_WEBSOCKETS */
 }

diff --git a/tests/libtest/lib2301.c b/tests/libtest/lib2301.c
index 377228ab3a7b6f78b466512153b6f9a086f63f6d..cd31207703db9e3742762ee4399d27aa7d2cebc9 100644 (file)
--- a/tests/libtest/lib2301.c
+++ b/tests/libtest/lib2301.c
@@ -149,6 +149,6 @@ CURLcode test(char *URL)
   return res;
 }
 
-#else /* no websockets */
+#else /* no WebSockets */
 NO_SUPPORT_BUILT_IN
 #endif