[Gnash-commit] /srv/bzr/gnash/trunk r11942: add support for php as a file type.

[Rob Savoye]

------------------------------------------------------------
revno: 11942
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-02-13 17:41:33 -0700
message:
  add support for php as a file type.
modified:
  libnet/diskstream.cpp
  libnet/diskstream.h
  libnet/http.cpp

=== modified file 'libnet/diskstream.cpp'
--- a/libnet/diskstream.cpp     2010-01-24 17:09:43 +0000
+++ b/libnet/diskstream.cpp     2010-02-14 00:41:33 +0000
@@ -757,7 +757,7 @@
                  // reset to the beginning of the file
                  _offset = 0;
              } else {
-                 log_network("\tPlaying part of file %s, offset is: %d out of 
%d bytes.", _filespec, _offset, _filesize);
+                 //log_network("\tPlaying part of file %s, offset is: %d out 
of %d bytes.", _filespec, _offset, _filesize);
 #ifdef HAVE_SENDFILE_XX
                  ret = sendfile(netfd, _filefd, &_offset, _pagesize);
 #else
@@ -1006,6 +1006,8 @@
       _filetype = FILETYPE_OGG;
     } else if (suffix == "swf") {
       _filetype = FILETYPE_SWF;
+    } else if (suffix == "php") {
+      _filetype = FILETYPE_PHP;
     } else if (suffix == "flv") {
       _filetype = FILETYPE_FLV;
     }else if (suffix == "mp3") {

=== modified file 'libnet/diskstream.h'
--- a/libnet/diskstream.h       2010-01-01 20:41:28 +0000
+++ b/libnet/diskstream.h       2010-02-14 00:41:33 +0000
@@ -82,7 +82,8 @@
     FILETYPE_VP6,
     FILETYPE_XML,
     FILETYPE_FLAC,
-    FILETYPE_ENCODED
+    FILETYPE_ENCODED,
+    FILETYPE_PHP,
   } filetype_e;
 
     DSOEXPORT DiskStream();

=== modified file 'libnet/http.cpp'
--- a/libnet/http.cpp   2010-01-21 00:08:08 +0000
+++ b/libnet/http.cpp   2010-02-14 00:41:33 +0000
@@ -1103,6 +1103,9 @@
     case DiskStream::FILETYPE_FLAC:
          _buffer += "Content-Type: audio/flac\r\n";
          break;
+    case DiskStream::FILETYPE_PHP:
+         _buffer += "Content-Type: application/x-httpd-php\r\n";
+         break;
       default:
          _buffer += "Content-Type: text/html\r\n";
     }