update for gc weekly.2011-05-22

fiber · fiber · commit 32ed88126edf · 2011-05-26T14:32:43.000+02:00
diff --git a/request.go b/request.go
@@ -64,7 +64,7 @@ func flattenParams(fullParams map[string][]string) map[string]string {
 
 func newRequest(hr *http.Request, hc http.ResponseWriter) *Request {
 
-    remoteAddr, _ := net.ResolveTCPAddr(hr.RemoteAddr)
+    remoteAddr, _ := net.ResolveTCPAddr("tcp", hr.RemoteAddr)
 
     req := Request{
         Method:     hr.Method,
@@ -275,7 +275,7 @@ func writeTo(s string, val reflect.Value) os.Error {
     // if we're writing to an interace value, just set the byte data
     // TODO: should we support writing to a pointer?
     case reflect.Interface:
-        v.Set(reflect.NewValue(s))
+        v.Set(reflect.ValueOf(s))
     case reflect.Bool:
         if strings.ToLower(s) == "false" || s == "0" {
             v.SetBool(false)
@@ -306,7 +306,7 @@ func writeTo(s string, val reflect.Value) os.Error {
     case reflect.Slice:
         typ := v.Type()
         if typ.Elem().Kind() == reflect.Uint || typ.Elem().Kind() == reflect.Uint8 || typ.Elem().Kind() == reflect.Uint16 || typ.Elem().Kind() == reflect.Uint32 || typ.Elem().Kind() == reflect.Uint64 || typ.Elem().Kind() == reflect.Uintptr {
-            v.Set(reflect.NewValue([]byte(s)))
+            v.Set(reflect.ValueOf([]byte(s)))
         }
     }
     return nil
@@ -329,7 +329,7 @@ func (r *Request) writeToContainer(val reflect.Value) os.Error {
         }
         elemtype := v.Type().Elem()
         for pk, pv := range r.Params {
-            mk := reflect.NewValue(pk)
+            mk := reflect.ValueOf(pk)
             mv := reflect.Zero(elemtype)
             writeTo(pv, mv)
             v.SetMapIndex(mk, mv)
@@ -360,7 +360,7 @@ func (r *Request) UnmarshalParams(val interface{}) os.Error {
     if strings.HasPrefix(r.Headers.Get("Content-Type"), "application/json") {
         return json.Unmarshal(r.ParamData, val)
     } else {
-        err := r.writeToContainer(reflect.NewValue(val))
+        err := r.writeToContainer(reflect.ValueOf(val))
         if err != nil {
             return err
         }
diff --git a/web.go b/web.go
@@ -172,7 +172,7 @@ func defaultStaticDir() string {
 }
 
 func init() {
-    contextType = reflect.Typeof(Context{})
+    contextType = reflect.TypeOf(Context{})
     //find the location of the exe file
     arg0 := path.Clean(os.Args[0])
     wd, _ := os.Getwd()
@@ -201,7 +201,7 @@ func (s *Server) addRoute(r string, method string, handler interface{}) {
     if fv, ok := handler.(reflect.Value); ok {
         s.routes.Push(route{r, cr, method, fv})
     } else {
-        fv := reflect.NewValue(handler)
+        fv := reflect.ValueOf(handler)
         s.routes.Push(route{r, cr, method, fv})
     }
 }
@@ -358,10 +358,10 @@ func (s *Server) routeHandler(req *Request, c conn) {
         var args vector.Vector
         handlerType := route.handler.Type()
         if requiresContext(handlerType) {
-            args.Push(reflect.NewValue(&ctx))
+            args.Push(reflect.ValueOf(&ctx))
         }
         for _, arg := range match[1:] {
-            args.Push(reflect.NewValue(arg))
+            args.Push(reflect.ValueOf(arg))
         }
 
         valArgs := make([]reflect.Value, args.Len())
@@ -590,7 +590,7 @@ func Urlencode(data map[string]string) string {
 //Extracts the method "name" from the value represented by "val"
 //This allows methods to be handlers
 func MethodHandler(val interface{}, name string) reflect.Value {
-    v := reflect.NewValue(val)
+    v := reflect.ValueOf(val)
     typ := v.Type()
     n := typ.NumMethod()
     for i := 0; i < n; i++ {
