[Gnash-commit] /srv/bzr/gnash/trunk r11397: use real value for ifdef test instead of just 1 or 0. Use constant for cgi port number instead of hard coding it.

[Rob Savoye]

------------------------------------------------------------
revno: 11397
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2009-08-08 10:13:37 -0600
message:
  use real value for ifdef test instead of just 1 or 0. Use constant for cgi 
port number instead of hard coding it.
modified:
  cygnal/http_server.cpp

=== modified file 'cygnal/http_server.cpp'
--- a/cygnal/http_server.cpp    2009-08-04 17:39:22 +0000
+++ b/cygnal/http_server.cpp    2009-08-08 16:13:37 +0000
@@ -46,7 +46,7 @@
 #include "log.h"
 #include "crc.h"
 #include "network.h"
-#include "handler.h"
+//#include "handler.h"
 #include "utility.h"
 #include "buffer.h"
 #include "diskstream.h"
@@ -294,19 +294,18 @@
     // NOTE: this is a "special" path we trap until we have real CGI support
     if ((getField("content-type") == "application/x-amf")
        && (getField("content-type") == "application/x-amf")) {
-#if 1
+#ifdef USE_CGIBIN
        if (_filespec == "/echo/gateway") {
        }
        
        Proc cgis;
        string path = _docroot;
-//     string path = 
"/home/rob/projects/gnu/i686-pc-linux-gnu/gnash/rtmp/cygnal/cgi-bin";
        path += _filespec;
-       
-       cgis.startCGI(_filespec, true, 1234);
-       cgis.createClient("localhost", 1234);
+       cgis.startCGI(_filespec, true, CGIBIN_PORT);
+       cgis.createClient("localhost", CGIBIN_PORT);
        cgis.writeNet(*content);
        boost::shared_ptr<amf::Buffer> reply = cgis.readNet();
+       
        writeNet(fd, *reply);
 //     cgis.stopCGI(_filespec);
 #else
@@ -493,7 +492,7 @@
     return _buffer;
 }
 
-#if 0
+#ifndef USE_CGIBIN
 // Parse an Echo Request message coming from the Red5 echo_test. This
 // method should only be used for testing purposes.
 vector<boost::shared_ptr<amf::Element > >