JuliaWeb
diff --git a/‎src/HttpServer.jl‎
Lines changed: 2 additions & 2 deletions b/‎src/HttpServer.jl‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/RequestParser.jl‎
Lines changed: 3 additions & 3 deletions b/‎src/RequestParser.jl‎
Lines changed: 3 additions & 3 deletions
@@ -212,7 +212,7 @@ function listen(server::Server, host::Base.IPAddr, port::Integer)
 end
 listen(server::Server, port::Integer) = listen(server, IPv4(0), port)
 
-@unix_only begin
+if is_unix()
     @doc """
 Start `server` to listen on named pipe/domain socket.
 
@@ -347,7 +347,7 @@ function run(server::Server; args...)
     port = get(params, :port, 0)
     host = get(params, :host, IPv4(0))
     use_https = haskey(params, :ssl)
-    use_sockets = @unix? (haskey(params, :socket) && !haskey(params, :port)) : false
+    use_sockets = is_unix() ? (haskey(params, :socket) && !haskey(params, :port)) : false
 
     server = if use_sockets
         listen(server, params[:socket])  # start server on Unix socket
 
@@ -34,7 +34,7 @@ end
 
 function on_url(parser, at, len)
     r = pd(parser).request
-    r.resource = string(r.resource, bytestring(convert(Ptr{UInt8}, at), Int(len)))
+    r.resource = string(r.resource, unsafe_string(convert(Ptr{UInt8}, at), Int(len)))
     return 0
 end
 
@@ -49,15 +49,15 @@ end
 
 function on_header_field(parser, at, len)
     r = pd(parser).request
-    header = bytestring(convert(Ptr{UInt8}, at))
+    header = unsafe_string(convert(Ptr{UInt8}, at))
     header_field = header[1:len]
     r.headers["current_header"] = header_field
     return 0
 end
 
 function on_header_value(parser, at, len)
     r = pd(parser).request
-    s = bytestring(convert(Ptr{UInt8}, at), Int(len))
+    s = unsafe_string(convert(Ptr{UInt8}, at), Int(len))
     r.headers[r.headers["current_header"]] = s
     r.headers["current_header"] = ""
     # delete!(r.headers, "current_header")