From: Alex Chapman <chapman.alex@gmail.com>
Date: Wed, 28 Jan 2009 09:58:35 +0000 (+1100)
Subject: Merge branch 'master' into experimental (untested!)
X-Git-Tag: 0.94~2132^2~26
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=4e41211399df7523acd9e5fb9d4dd71ac3140727

Merge branch 'master' into experimental (untested!)

Conflicts:
	basis/http/client/client.factor
---

4e41211399df7523acd9e5fb9d4dd71ac3140727
diff --cc basis/http/client/client.factor
index e6435ee12b,108ae5ecc4..9c56411290
--- a/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@@ -218,8 -198,6 +220,12 @@@ M: download-failed error
  : http-post ( post-data url -- response data )
      <post-request> http-request ;
  
 +: <put-request> ( data url -- request )
 +    <client-data-request> "PUT" >>method ;
 +
 +: http-put ( data url -- response data )
 +    <put-request> http-request ;
++
+ USING: vocabs vocabs.loader ;
+ 
+ "debugger" vocab [ "http.client.debugger" require ] when