Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- give roshttpd a rbuild file

Browse source 
- include it in build
- fix building with msvc

svn path=/trunk/; revision=25059
This commit is contained in:
Johannes Anderwald 2006-12-03 23:35:02 +00:00
parent 231c494a6f
commit 369fa23f46
8 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/base/applications/network/network.rbuild
View file

@ -25,6 +25,9 @@
<directory name="route"> <directory name="route">
<xi:include href="route/route.rbuild" /> <xi:include href="route/route.rbuild" />
</directory> </directory>
<directory name="roshttpd">
<xi:include href="roshttpd/roshttpd.rbuild" />
</directory>
<directory name="telnet"> <directory name="telnet">
<xi:include href="telnet/telnet.rbuild" /> <xi:include href="telnet/telnet.rbuild" />
</directory> </directory>

2
reactos/base/applications/network/roshttpd/common/socket.cpp
View file

@ -7,9 +7,9 @@
* REVISIONS: * REVISIONS:
* CSH 01/09/2000 Created * CSH 01/09/2000 Created
*/ */
#include <socket.h>
#include <string.h> #include <string.h>
#include <error.h> #include <error.h>
#include <socket.h>
#include <iterator.h> #include <iterator.h>
// ***************************** CSocket ***************************** // ***************************** CSocket *****************************

5
reactos/base/applications/network/roshttpd/http.cpp
View file

@ -12,7 +12,7 @@
* - Implement more entity-header entries * - Implement more entity-header entries
*/ */
#include <debug.h> #include <debug.h>
#include <iostream.h> #include <iostream>
#include <string.h> #include <string.h>
#include <http.h> #include <http.h>
@ -192,9 +192,6 @@ BOOL CHttpParser::Parse()
{ {
BOOL bStatus; BOOL bStatus;
CHAR ch;
if (RequestLine()) { if (RequestLine()) {
do { do {
if (!ReadString(sHeader, sizeof(sHeader))) if (!ReadString(sHeader, sizeof(sHeader)))

6
reactos/base/applications/network/roshttpd/include/config.h
View file

@ -6,8 +6,8 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#include <list.h>
#include <httpd.h> #include <httpd.h>
#include <list.h>
// General constants // General constants
#define APP_DESCRIPTION _T("ReactOS HTTP Daemon") #define APP_DESCRIPTION _T("ReactOS HTTP Daemon")
@ -15,8 +15,8 @@
// Default configuration // Default configuration
#define dcfgDescription _T("Default configuration") #define dcfgDescription _T("Default configuration")
#define dcfgMainBase _T("C:\\roshttpd\\") #define dcfgMainBase _T("C:\\roshttpd\\")
#define dcfgHttpBase "C:\\roshttpd\\HttpBase\\" #define dcfgHttpBase _T("C:\\roshttpd\\HttpBase\\")
#define dcfgDefaultResource "index.html" #define dcfgDefaultResource _T("index.html")
#define dcfgDefaultPort 80 #define dcfgDefaultPort 80
class CConfig { class CConfig {

2
reactos/base/applications/network/roshttpd/include/debug.h
View file

@ -9,7 +9,7 @@
#include <stdio.h> #include <stdio.h>
#ifdef DBG #ifdef DBG
#define DPRINT(x...) printf(x) #define DPRINT(x, ...) printf(x)
#else #else
#define DPRINT(x...) #define DPRINT(x...)
#endif #endif

2
reactos/base/applications/network/roshttpd/include/httpd.h
View file

@ -6,8 +6,8 @@
#ifndef __HTTPD_H #ifndef __HTTPD_H
#define __HTTPD_H #define __HTTPD_H
#include <thread.h>
#include <socket.h> #include <socket.h>
#include <thread.h>
#include <http.h> #include <http.h>
#define HTTPD_START WM_USER + 1 #define HTTPD_START WM_USER + 1

3
reactos/base/applications/network/roshttpd/include/socket.h
View file

@ -5,8 +5,7 @@
*/ */
#ifndef __SOCKET_H #ifndef __SOCKET_H
#define __SOCKET_H #define __SOCKET_H
#include <msvcrt/stdio.h> #include <stdio.h>
#include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <thread.h> #include <thread.h>
#include <list.h> #include <list.h>

23
reactos/base/applications/network/roshttpd/roshttpd.rbuild Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="roshttpd" type="win32cui" installbase="system32" installname="roshttpd.exe" stdlib="host">
<include base="roshttpd">include</include>
<define name="__USE_W32API" />
<define name="__USE_W32_SOCKETS" />
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
<library>kernel32</library>
<library>ws2_32</library>
<library>kernel32</library>
<file>config.cpp</file>
<file>error.cpp</file>
<file>http.cpp</file>
<file>httpd.cpp</file>
<file>roshttpd.cpp</file>
<directory name="common" >
<file>list.cpp</file>
<file>roshttpd.rc</file>
<file>socket.cpp</file>
<file>thread.cpp</file>
</directory>
</module>