]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
urldata: remove the 'rtspversion' field
authorDaniel Stenberg <daniel@haxx.se>
Mon, 8 Feb 2021 16:04:50 +0000 (17:04 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Mon, 8 Feb 2021 21:39:34 +0000 (22:39 +0100)
from struct connectdata and the corresponding code in http.c that set
it. It was never used for anything!

Closes #6581

lib/http.c
lib/urldata.h

index 4c80bf9380d56abd0ed72e893343865169954546..75cf7f4ab4353ae795ac853f961bc7ef8a03a9c2 100644 (file)
@@ -4204,14 +4204,14 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
       }
       else if(conn->handler->protocol & CURLPROTO_RTSP) {
         char separator;
+        int rtspversion;
         nc = sscanf(HEADER1,
                     " RTSP/%1d.%1d%c%3d",
                     &rtspversion_major,
-                    &conn->rtspversion,
+                    &rtspversion,
                     &separator,
                     &k->httpcode);
         if((nc == 4) && (' ' == separator)) {
-          conn->rtspversion += 10 * rtspversion_major;
           conn->httpversion = 11; /* For us, RTSP acts like HTTP 1.1 */
         }
         else {
index 09a78d9224264c3c1e2ec789894524905150ad4f..02a0342172cf56bd374162ca3659f0dc620f8f68 100644 (file)
@@ -981,12 +981,8 @@ struct connectdata {
   char *user;    /* user name string, allocated */
   char *passwd;  /* password string, allocated */
   char *options; /* options string, allocated */
-
   char *sasl_authzid;     /* authorisation identity string, allocated */
-
   int httpversion;        /* the HTTP version*10 reported by the server */
-  int rtspversion;        /* the RTSP version*10 reported by the server */
-
   struct curltime now;     /* "current" time */
   struct curltime created; /* creation time */
   struct curltime lastused; /* when returned to the connection cache */