Commit ae8e96f8 authored by jan.koester's avatar jan.koester
Browse files

test

parent e0768e83
Loading
Loading
Loading
Loading
+0 −27
Original line number Diff line number Diff line
@@ -2503,19 +2503,14 @@ const std::vector<char> libhttppp::HttpClient::_h2Request(

      std::vector<uint8_t> stream_payload;
      h3AppendFrame(stream_payload, 0x01, headers);
      fprintf(stderr, "[H3-DBG] %s headers_frame=%zu bytes\n", method.c_str(), stream_payload.size());

      if (postBody && !postBody->empty()) {
        std::vector<uint8_t> body(postBody->begin(), postBody->end());
        h3AppendFrame(stream_payload, 0x00, body);
        fprintf(stderr, "[H3-DBG] %s payload_total=%zu bytes (body=%zu)\n", method.c_str(), stream_payload.size(), postBody->size());
      }

      fprintf(stderr, "[H3-DBG] openStream(bidi)...\n");
      uint64_t stream_id = q->openStream(true);
      fprintf(stderr, "[H3-DBG] openStream returned sid=%lu, calling sendStreamData(%zu bytes)...\n", (unsigned long)stream_id, stream_payload.size());
      q->sendStreamData(stream_id, stream_payload, true);
      fprintf(stderr, "[H3-DBG] sendStreamData done\n");

      std::vector<uint8_t> raw;
      std::vector<char> body;
@@ -2885,17 +2880,10 @@ const std::vector<char> libhttppp::HttpClient::Delete(libhttppp::HttpRequest &nr
const std::vector<char> libhttppp::HttpClient::Put(libhttppp::HttpRequest &nreq,
                                                   const std::vector<char> &put, size_t maxTries)
{
    fprintf(stderr, "[PUT-DBG] Put() called, body=%zu bytes\n", put.size());
    fflush(stderr);
    size_t tries = 0;
    for (;;) {
        try {
            // Reuse existing connection if possible
            fprintf(stderr, "[PUT-DBG] _ensureConnected...\n");
            fflush(stderr);
            _ensureConnected();
            fprintf(stderr, "[PUT-DBG] _ensureConnected done\n");
            fflush(stderr);

            std::stringstream host;
            host << _url.getHost() << ":" << _url.getPort();
@@ -2908,20 +2896,13 @@ const std::vector<char> libhttppp::HttpClient::Put(libhttppp::HttpRequest &nreq,
            nreq.setHeaderData("content-length")->push_back(std::to_string(put.size()));

            if (dynamic_cast<netplus::quic*>(_cltsock.get())) {
                fprintf(stderr, "[PUT-DBG] QUIC detected, calling _h3Request(PUT)\n");
                fflush(stderr);
                return _h3Request("PUT", nreq, &put);
            }

            if (_isH2) {
                fprintf(stderr, "[PUT-DBG] H2 path, calling _h2Request(PUT)\n");
                fflush(stderr);
                return _h2Request("PUT", nreq, &put);
            }

            fprintf(stderr, "[PUT-DBG] H1 path, sending %zu bytes\n", put.size());
            fflush(stderr);

            // HTTP/1.x path
            if (nreq.getRequestVersion().empty())
                nreq.setRequestVersion(HTTPVERSION(1.1));
@@ -2930,8 +2911,6 @@ const std::vector<char> libhttppp::HttpClient::Put(libhttppp::HttpRequest &nreq,
            {
                std::string header;
                nreq.printHeader(header);
                fprintf(stderr, "[PUT-DBG] H1 header: %zu bytes\n", header.size());
                fflush(stderr);
                if (!_cltsock || _cltsock->fd() < 0)
                    resetConnection();

@@ -2939,15 +2918,9 @@ const std::vector<char> libhttppp::HttpClient::Put(libhttppp::HttpRequest &nreq,
                combined.reserve(header.size() + put.size());
                combined.insert(combined.end(), header.begin(), header.end());
                combined.insert(combined.end(), put.begin(), put.end());
                fprintf(stderr, "[PUT-DBG] H1 _sendAll %zu bytes...\n", combined.size());
                fflush(stderr);
                _sendAll(combined.data(), combined.size());
                fprintf(stderr, "[PUT-DBG] H1 _sendAll done\n");
                fflush(stderr);
            }

            fprintf(stderr, "[PUT-DBG] H1 waiting for response...\n");
            fflush(stderr);
            return _h1ReadResponse("PUT");

        } catch (netplus::NetException &e) {