Hadoop Pipes Exception: Illegal text protocol command

Index: hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
===================================================================
--- hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc    (revision 340277)
+++ hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc    (working copy)
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <pthread.h>
 #include <iostream>
@@ -806,8 +805,8 @@
       }
       if (reducer != NULL) {
         int64_t spillSize = 100;
-        if (jobConf->hasKey("mapreduce.task.io.sort.mb")) {
-          spillSize = jobConf->getInt("mapreduce.task.io.sort.mb");
+        if (jobConf->hasKey("io.sort.mb")) {
+          spillSize = jobConf->getInt("io.sort.mb");
         }
         writer = new CombineRunner(spillSize * 1024 * 1024, this, reducer, 
                                    uplink, partitioner, numReduces);
@@ -1042,7 +1041,7 @@
    */
   void* ping(void* ptr) {
     TaskContextImpl* context = (TaskContextImpl*) ptr;
-    char* portStr = getenv("mapreduce.pipes.command.port");
+    char* portStr = getenv("hadoop.pipes.command.port");
     int MAX_RETRIES = 3;
     int remaining_retries = MAX_RETRIES;
     while (!context->isDone()) {
@@ -1095,7 +1094,7 @@
     try {
       TaskContextImpl* context = new TaskContextImpl(factory);
       Protocol* connection;
-      char* portStr = getenv("mapreduce.pipes.command.port");
+      char* portStr = getenv("hadoop.pipes.command.port");
       int sock = -1;
       FILE* stream = NULL;
       FILE* outStream = NULL;
@@ -1128,8 +1127,8 @@
         HADOOP_ASSERT(setbuf == 0, string("problem with setvbuf for outStream: ")
                                      + strerror(errno));
         connection = new BinaryProtocol(stream, context, outStream);
-      } else if (getenv("mapreduce.pipes.commandfile")) {
-        char* filename = getenv("mapreduce.pipes.commandfile");
+      } else if (getenv("hadoop.pipes.command.file")) {
+        char* filename = getenv("hadoop.pipes.command.file");
         string outFilename = filename;
         outFilename += ".out";
         stream = fopen(filename, "r");