[svn:parrot] rev 7974 - trunk/io

[bernhard]

Author: bernhard
Date: Wed May  4 10:04:23 2005
New Revision: 7974

Modified:
   trunk/io/io_private.h
   trunk/io/io_unix.c
   trunk/io/io_win32.c
Log:
'read' now returns an ascii STRING, as opposed to binary STRING, on Win32
as well. 
Thus it is possible that examples/io/httpd.imc works on Win32 again.


Modified: trunk/io/io_private.h
==============================================================================
--- trunk/io/io_private.h       (original)
+++ trunk/io/io_private.h       Wed May  4 10:04:23 2005
@@ -27,7 +27,7 @@
 
 #define PARROT_IN_IO 1
 #define PARROT_ASYNC_DEVEL 0
-#define PARROT_NET_DEVEL 0
+#define PARROT_NET_DEVEL 1
 
 #include <parrot/io.h>
 

Modified: trunk/io/io_unix.c
==============================================================================
--- trunk/io/io_unix.c  (original)
+++ trunk/io/io_unix.c  Wed May  4 10:04:23 2005
@@ -935,7 +935,7 @@
             close(io->fd);
         }
         /* The charset should propably be 'binary', but right now httpd.imc
-         * only workd with 'ascii'
+         * only works with 'ascii'
          */
         *s = string_make(interpreter, buf, bytesread, "ascii", 0);
         if (!*s) {

Modified: trunk/io/io_win32.c
==============================================================================
--- trunk/io/io_win32.c (original)
+++ trunk/io/io_win32.c Wed May  4 10:04:23 2005
@@ -691,7 +691,10 @@
         else {
             close((SOCKET)io->fd);
         }
-        *s = string_make(interpreter, buf, bytesread, "binary", 0);
+        /* The charset should propably be 'binary', but right now httpd.imc
+         * only works with 'ascii'
+         */
+        *s = string_make(interpreter, buf, bytesread, "ascii", 0);
         if(!*s) {
             PANIC("PIO_recv: Failed to allocate string");
         }