1.fix 0.12.0-dev.2334+aef1da163 build

build.zig

@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) !void {
 
     const use_openssl = b.option(bool, "openssl", "Use system-installed openssl for TLS support in zap") orelse blk: {
         // Alternatively, use an os env var to determine whether to build openssl support
-        if (std.posix.getenv("ZAP_USE_OPENSSL")) |val| {
+        if (std.os.getenv("ZAP_USE_OPENSSL")) |val| {
             if (std.mem.eql(u8, val, "true")) break :blk true;
         }
         break :blk false;
@@ -257,7 +257,7 @@ pub fn build(b: *std.Build) !void {
         .target = target,
         .optimize = optimize,
     });
-    var announceybot_step = b.step("announceybot", "Build announceybot");
+    const announceybot_step = b.step("announceybot", "Build announceybot");
     const announceybot_build_step = b.addInstallArtifact(announceybot_exe, .{});
     announceybot_step.dependOn(&announceybot_build_step.step);
     all_step.dependOn(&announceybot_build_step.step);

examples/cookies/cookies.zig

@@ -11,12 +11,14 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.open(.GET, uri, h, .{});
-    defer req.deinit();
-
-    try req.headers.append("cookie", "ZIG_ZAP=awesome");
-    try req.send(.{});
-    try req.wait();
+    var result = try http_client.fetch(a,.{
+        .method = .GET,
+        .location = .{
+            .uri = uri,
+        },
+        .headers = h,
+    });
+    defer result.deinit();
 }
 
 fn makeRequestThread(a: std.mem.Allocator, url: []const u8) !std.Thread {

examples/http_params/http_params.zig

@@ -11,11 +11,14 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.open(.GET, uri, h, .{});
-    defer req.deinit();
-
-    try req.send(.{});
-    try req.wait();
+    var result = try http_client.fetch(a,.{
+        .method = .GET,
+        .location = .{
+            .uri = uri,
+        },
+        .headers = h,
+    });
+    defer result.deinit();
 }
 
 fn makeRequestThread(a: std.mem.Allocator, url: []const u8) !std.Thread {

src/tests/test_auth.zig

@@ -146,22 +146,20 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8, auth: ?ClientAuthReqHeader
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.open(.GET, uri, h, .{});
-    defer req.deinit();
-
-    try req.send(.{});
-    try req.wait();
-    // req.deinit() panics!
-    // defer req.deinit();
-
+    var result = try http_client.fetch(a,.{
+        .location = .{
+            .uri = uri,
+        },
+        .headers = h,
+    });
+    defer result.deinit();
     // without this block, the tests sometimes get stuck which
     // might have to do with connection pooling and connections being in
     // a different state when all data has been read?!?
     {
-        var buffer: [1024]u8 = undefined;
-        // we know we won't receive a lot
-        const len = try req.reader().readAll(&buffer);
-        std.debug.print("RESPONSE:\n{s}\n", .{buffer[0..len]});
+        if(result.body)|body|{
+            std.debug.print("RESPONSE:\n{s}\n", .{body[0..]});
+        }
     }
 
     zap.stop();

src/tests/test_http_params.zig

@@ -10,11 +10,14 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.open(.GET, uri, h, .{});
-    defer req.deinit();
-
-    try req.send(.{});
-    try req.wait();
+    var result = try http_client.fetch(a,.{
+        .method = .GET,
+        .location = .{
+            .uri = uri,    
+        },
+        .headers = h,
+    });
+    defer result.deinit();
     zap.stop();
 }
 

src/tests/test_sendfile.zig

@@ -15,13 +15,19 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void {
     var http_client: std.http.Client = .{ .allocator = a };
     defer http_client.deinit();
 
-    var req = try http_client.open(.GET, uri, h, .{});
-    defer req.deinit();
-
-    try req.send(.{});
-    try req.wait();
-    read_len = try req.readAll(&buffer);
+    var result = try http_client.fetch(a,.{
+        .method = .GET,
+        .location = .{
+            .uri = uri,
+        },
+        .headers = h,
+    });
+    defer result.deinit();
 
+    if(result.body)|body|{
+        read_len = body.len;
+        std.mem.copyForwards(u8,&buffer,body);
+    }
     zap.stop();
 }
 

tools/announceybot.zig

@@ -160,23 +160,16 @@ fn sendToDiscordPart(allocator: std.mem.Allocator, url: []const u8, message_json
     var http_client: std.http.Client = .{ .allocator = allocator };
     defer http_client.deinit();
 
-    // request
-    var req = try http_client.open(.POST, uri, h, .{});
-    defer req.deinit();
-
-    req.transfer_encoding = .chunked;
-
-    // connect, send request
-    try req.send(.{});
-
-    // send POST payload
-    try req.writer().writeAll(message_json);
-    try req.finish();
-
-    // wait for response
-    try req.wait();
-    var buffer: [1024]u8 = undefined;
-    _ = try req.readAll(&buffer);
+    var result = try http_client.fetch(allocator,.{
+        .method = .POST,
+        .location = .{
+            .uri = uri,
+        },
+        .payload = .{
+            .string = message_json,
+        },
+    });
+    defer result.deinit();
 }
 
 fn sendToDiscord(allocator: std.mem.Allocator, url: []const u8, message: []const u8) !void {

tools/pkghash.zig

@@ -266,8 +266,7 @@ pub fn cmdPkg(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
 
         // computePackageHash will close the directory after completion
         // std.debug.print("abspath: {s}\n", .{cwd_absolute_path});
-        var cwd_copy = try fs.openDirAbsolute(cwd_absolute_path, .{});
-        errdefer cwd_copy.close();
+        const dir = try fs.openDirAbsolute(cwd_absolute_path, .{});
 
         var thread_pool: ThreadPool = undefined;
         try thread_pool.init(.{ .allocator = gpa });
@@ -281,7 +280,7 @@ pub fn cmdPkg(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
         };
         break :blk try computePackageHashExcludingDirectories(
             &thread_pool,
-            cwd_copy,
+            dir,
             excluded_directories,
         );
     };