[myserver-commit] [2811] corrected include path

[Daniele Perrone]

Revision: 2811
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2811
Author:   dperrone
Date:     2008-09-13 21:16:59 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
corrected include path

Modified Paths:
--------------
    trunk/plugins/generics/http_checker/http_checker.cpp
    trunk/plugins/generics/python_http_handler/python_http_handler.cpp
    trunk/plugins/generics/rules_checker/functions.cpp
    trunk/plugins/generics/rules_checker/rules_checker.cpp
    trunk/plugins/generics/rules_checker/string_alloc.cpp
    trunk/plugins/http_managers/php/php.cpp
    trunk/plugins/http_managers/php/php.h

Modified: trunk/plugins/generics/http_checker/http_checker.cpp
===================================================================
--- trunk/plugins/generics/http_checker/http_checker.cpp        2008-09-13 
18:44:13 UTC (rev 2810)
+++ trunk/plugins/generics/http_checker/http_checker.cpp        2008-09-13 
21:16:59 UTC (rev 2811)
@@ -16,10 +16,10 @@
 */
 #include <stdafx.h>
 #include <string.h>
-#include <include/server.h>
-#include <include/multicast.h>
-#include <include/http.h>
-#include <include/dynamic_executor.h>
+#include <include/server/server.h>
+#include <include/multicast/multicast.h>
+#include <include/protocol/http/http.h>
+#include <include/plugin/executor/dynamic_executor.h>
 #include <Python.h>
 
 #ifdef WIN32
@@ -87,11 +87,11 @@
        string value;
        if (!PyArg_ParseTuple(args, (char*)"s", &header))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        context->request.getValue(header, &value);
-       
+
        return Py_BuildValue((char*)"s", value.c_str());
 }
 
@@ -102,11 +102,11 @@
        const char* ret;
        if (!PyArg_ParseTuple(args, (char*)"ss", &header, &value))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        ret = context->request.setValue(header, value)->c_str();
-       
+
        return Py_BuildValue((char*)"s", ret);
 }
 
@@ -120,11 +120,11 @@
 
        if(data->ret)
                return NULL;
-       
+
        data->td->http->raiseHTTPError(error);
-       
+
        data->ret = 1;
-       
+
        return Py_BuildValue((char*)"s", "");
 }
 
@@ -138,11 +138,11 @@
 
        if(data->ret)
                return NULL;
-       
+
        data->td->http->sendHTTPRedirect(dest);
-       
+
        data->ret = 1;
-       
+
        return Py_BuildValue((char*)"s", dest);
 }
 
@@ -167,7 +167,7 @@
                bool file;
        };
 public:
-       
+
        virtual int updateMulticast(MulticastRegistry<string, void*, int>* reg, 
string& msg, void* arg)
        {
                HttpThreadContext *td = (HttpThreadContext*)arg;
@@ -297,7 +297,7 @@
 
                        observer.addRule(data, file);
                }
-               
+
        }
 
        mutex.init();

Modified: trunk/plugins/generics/python_http_handler/python_http_handler.cpp
===================================================================
--- trunk/plugins/generics/python_http_handler/python_http_handler.cpp  
2008-09-13 18:44:13 UTC (rev 2810)
+++ trunk/plugins/generics/python_http_handler/python_http_handler.cpp  
2008-09-13 21:16:59 UTC (rev 2811)
@@ -16,11 +16,11 @@
 */
 #include <stdafx.h>
 #include <string.h>
-#include <include/server.h>
-#include <include/http_data_handler.h>
-#include <include/multicast.h>
-#include <include/http.h>
-#include <include/dynamic_executor.h>
+#include <include/server/server.h>
+#include <include/protocol/http/http_data_handler.h>
+#include <include/base/multicast/multicast.h>
+#include <include/protocol/http/http.h>
+#include <include/plugin/executor/dynamic_executor.h>
 #include <Python.h>
 
 
@@ -54,8 +54,8 @@
 
        void setHttpThreadContext(HttpThreadContext* td){this->td = td;}
        void setRet(int r){ret = r;}
-  
 
+
        virtual int send(HttpThreadContext*, ConnectionPtr s,
                    const char* exec, const char* cmdLine,
                    int execute, int onlyHeader)
@@ -67,7 +67,7 @@
   {
     return appendDataToHTTPChannel(td, buffer, size, 0, &chain, 0, useChunks);
   }
-  
+
   void check()
   {
     checkDataChunks(td, &keepalive, &useChunks);
@@ -131,11 +131,11 @@
        string value;
        if (!PyArg_ParseTuple(args, (char*)"s", &header))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        context->response.getValue(header, &value);
-       
+
        return Py_BuildValue((char*)"s", value.c_str());
 }
 
@@ -145,11 +145,11 @@
        string value;
        if (!PyArg_ParseTuple(args, (char*)"s", &header))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        context->request.getValue(header, &value);
-       
+
        return Py_BuildValue((char*)"s", value.c_str());
 }
 
@@ -159,13 +159,13 @@
 
        if (!PyArg_ParseTuple(args, (char*)"s", &msg))
                return NULL;
-       
+
   serverInstance->logLockAccess();
   serverInstance->logPreparePrintError();
   serverInstance->logWriteln(msg);
   serverInstance->logEndPrintError();
   serverInstance->logUnlockAccess();
-       
+
        return NULL;
 }
 
@@ -176,9 +176,9 @@
        const char* ret;
        if (!PyArg_ParseTuple(args, (char*)"ss", &header, &value))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        string *retS =  context->response.setValue(header, value);
 
   if(retS)
@@ -196,9 +196,9 @@
        const char* ret;
        if (!PyArg_ParseTuple(args, (char*)"ss", &header, &value))
                return NULL;
-       
+
        HttpThreadContext* context = getThreadContext();
-       
+
        string *retS =  context->request.setValue(header, value);
 
   if(retS)
@@ -216,18 +216,18 @@
 
   tdata->check();
 
-  HttpHeaders::buildHTTPResponseHeader(td->buffer->getBuffer(), 
+  HttpHeaders::buildHTTPResponseHeader(td->buffer->getBuffer(),
                                        &(td->response));
 
-  if(td->connection->socket->send(td->buffer->getBuffer(), 
-             (u_long)strlen(td->buffer->getBuffer()), 0) 
+  if(td->connection->socket->send(td->buffer->getBuffer(),
+             (u_long)strlen(td->buffer->getBuffer()), 0)
      == SOCKET_ERROR)
                {
       return Py_BuildValue((char*)"i", 1);
-               }       
+               }
 
   tdata->setRet(1);
-         
+
   return Py_BuildValue((char*)"i", 0);
 }
 
@@ -257,7 +257,7 @@
     return Py_BuildValue((char*)"i", 0);
 
   tdata->setRet(1);
-               
+
        return Py_BuildValue((char*)"i", size);
 }
 
@@ -280,11 +280,11 @@
 
        if(data->getRet())
                return NULL;
-       
+
        data->getHttpThreadContext()->http->raiseHTTPError(error);
-       
+
        data->setRet(1);
-       
+
        return Py_BuildValue((char*)"s", "");
 }
 
@@ -308,11 +308,11 @@
 
        if(data->getRet())
                return NULL;
-       
+
        data->getHttpThreadContext()->http->sendHTTPRedirect(dest);
-       
+
        data->setRet(1);
-       
+
        return Py_BuildValue((char*)"s", dest);
 }
 
@@ -345,7 +345,7 @@
                bool file;
        };
 public:
-       
+
        virtual int updateMulticast(MulticastRegistry<string, void*, int>* reg, 
string& msg, void* arg)
        {
                HttpThreadContext *td = (HttpThreadContext*)arg;
@@ -476,7 +476,7 @@
 
                        observer.addRule(data, file);
                }
-               
+
        }
 
        mutex.init();

Modified: trunk/plugins/generics/rules_checker/functions.cpp
===================================================================
--- trunk/plugins/generics/rules_checker/functions.cpp  2008-09-13 18:44:13 UTC 
(rev 2810)
+++ trunk/plugins/generics/rules_checker/functions.cpp  2008-09-13 21:16:59 UTC 
(rev 2811)
@@ -1,8 +1,8 @@
 using namespace std;
 
 #include "heading.h"
-#include <include/http.h>
-#include <include/http_headers.h>
+#include <include/protocol/http/http.h>
+#include <include/protocol/http/http_headers.h>
 
 string* call_function(void* context, string* func)
 {

Modified: trunk/plugins/generics/rules_checker/rules_checker.cpp
===================================================================
--- trunk/plugins/generics/rules_checker/rules_checker.cpp      2008-09-13 
18:44:13 UTC (rev 2810)
+++ trunk/plugins/generics/rules_checker/rules_checker.cpp      2008-09-13 
21:16:59 UTC (rev 2811)
@@ -17,7 +17,7 @@
 
 #include <stdafx.h>
 #include <string.h>
-#include <include/server.h>
+#include <include/server/server.h>
 #include "heading.h"
 
 #ifdef WIN32
@@ -56,7 +56,7 @@
 
                                return 1;
                        }
-                               
+
                }
                free_strings(&context);
                return 0;
@@ -71,12 +71,12 @@
 
                if(pos == string::npos)
                        return; //TODO: error.
-               
+
                it.condition.assign(ruleStr.substr(0, pos));
                it.event.assign(ruleStr.substr(pos+2, string::npos));
                rules.push_back(it);
        }
-       
+
 private:
        list<Item> rules;
 };
@@ -108,22 +108,22 @@
                serverInstance->logUnlockAccess();
                return -1;
        }
-       
-       
+
+
        staticData->addMulticast(msg, &observer);
-       
+
        configuration = serverInstance->getConfiguration();
        xmlDoc = configuration->getDoc();
-       
+
        for(xmlNodePtr ptr = xmlDoc->children->next->children; ptr; ptr = 
ptr->next)
        {
                char* data;
                if(!xmlStrcmp(ptr->name, (const xmlChar *)"RULES_CHECKER_RULE"))
                {
-                       
+
                        if(ptr->children && ptr->children->next && 
ptr->children->next->content)
                                data = (char*)ptr->children->next->content;
-                       
+
                        if(!data)
                        {
                                serverInstance->logLockAccess();
@@ -133,10 +133,10 @@
                                serverInstance->logUnlockAccess();
                                return -1;
                        }
-                       
+
                        observer.addRule(data);
                }
-               
+
        }
 
        return 0;

Modified: trunk/plugins/generics/rules_checker/string_alloc.cpp
===================================================================
--- trunk/plugins/generics/rules_checker/string_alloc.cpp       2008-09-13 
18:44:13 UTC (rev 2810)
+++ trunk/plugins/generics/rules_checker/string_alloc.cpp       2008-09-13 
21:16:59 UTC (rev 2811)
@@ -17,7 +17,7 @@
 #include "heading.h"
 
 #include <list>
-#include <include/thread.h>
+#include <include/base/thread/thread.h>
 
 static list<string*> strings;
 
@@ -37,7 +37,7 @@
 
 void free_strings(ThreadContext* context)
 {
-       
+
        list<string*>::iterator it = context->strings.begin();
        while(it != context->strings.end())
        {

Modified: trunk/plugins/http_managers/php/php.cpp
===================================================================
--- trunk/plugins/http_managers/php/php.cpp     2008-09-13 18:44:13 UTC (rev 
2810)
+++ trunk/plugins/http_managers/php/php.cpp     2008-09-13 21:16:59 UTC (rev 
2811)
@@ -15,13 +15,12 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "php.h"
-#include <include/thread.h>
-#include <include/mutex.h>
-#include <include/hash_map.h>
-#include <include/http_data_handler.h>
-#include <include/http_response.h>
-#include <include/cgi.h>
-#include <include/thread.h>
+#include <include/base/thread/thread.h>
+#include <include/base/sync/mutex.h>
+#include <include/base/hash_map/hash_map.h>
+#include <include/protocol/http/http_data_handler.h>
+#include <include/protocol/http/http_response.h>
+#include <include/http_handler/cgi/cgi.h>
 
 #include <main/php.h>
 #include <main/SAPI.h>
@@ -66,7 +65,7 @@
 int modifyHeader(HttpResponseHeader *response, char* name, char* value)
 {
        string* val = response->getValue(name, NULL);
-       
+
        if(val)
                val->assign(value);
        else
@@ -100,12 +99,12 @@
                                                                                
                                                                         
&data->td->response);
 
 
-                       
+
        location = data->td->response.getValue("Location", 0);
 
        /*
-        *If it is present Location: xxx in the header 
-        *send a redirect to xxx.  
+        *If it is present Location: xxx in the header
+        *send a redirect to xxx.
         */
        if(location && location->length())
        {
@@ -120,7 +119,7 @@
 
 
 
-       
+
 }
 
 int myphp_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct 
*sapi_headers TSRMLS_DC)
@@ -140,7 +139,7 @@
 
        modifyHeader(&(data->td->response), sapi_header->header, valInit);
 
-       sapi_header->header[sep] = ':'; 
+       sapi_header->header[sep] = ':';
 
        return 0;
 }
@@ -155,7 +154,7 @@
                        nbr = 0;
 
        return nbr;
-       
+
 }
 
 int myphp_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
@@ -183,8 +182,8 @@
 
 }
 
-int myphp_ub_write(const char *str, unsigned int str_length TSRMLS_DC) 
-{ 
+int myphp_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
+{
        PhpData* data = getPhpData();
 
        if(!data->headerSent)
@@ -197,9 +196,9 @@
        return HttpDataHandler::appendDataToHTTPChannel(data->td,
                                                                                
                                                                                
                                        (char*)str,
                                                                                
                                                                                
                                        (u_long)str_length,
-                                                                               
                                                                                
                                        &(data->td->outputData), 
+                                                                               
                                                                                
                                        &(data->td->outputData),
                                                                                
                                                                                
                                        &(data->chain),
-                                                                               
                                                                                
                                        (bool)data->td->appendOutputs, 
+                                                                               
                                                                                
                                        (bool)data->td->appendOutputs,
                                                                                
                                                                                
                                        data->useChunks);
 
 
@@ -251,8 +250,8 @@
 }
 
 int    myphp_startup(struct _sapi_module_struct *sapi_module)
-{      
-       if(php_module_startup(sapi_module, entries, loadedEntries) == FAILURE) 
+{
+       if(php_module_startup(sapi_module, entries, loadedEntries) == FAILURE)
        {
                return FAILURE;
        }
@@ -260,7 +259,7 @@
        return 0;
 }
 
-static sapi_module_struct myphp_module = 
+static sapi_module_struct myphp_module =
 {
        "myphp",
        "MyServer PHP Module",
@@ -274,20 +273,20 @@
        myphp_flush,                          /* flush */
        NULL, //myphp_get_stat,                       /* get uid */
        NULL, //myphp_getenv,                         /* getenv */
-       
+
        php_error,                                      /* error handler */
-       
+
        myphp_header_handler,                 /* header handler */
        myphp_send_headers,                   /* send headers handler */
        NULL,                                           /* send header handler 
*/
-       
+
        myphp_read_post,                      /* read POST data */
        myphp_read_cookies,                   /* read Cookies */
-       
+
        myphp_register_variables,
        myphp_log_message,                    /* Log message */
        NULL,//myphp_sapi_get_request_time,               /* Request Time */
-       
+
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 
@@ -305,7 +304,7 @@
                        singleRequest = 1;
                else
                        singleRequest = 0;
-               
+
                loadedEntries = 0;
 
                if(singleRequest)
@@ -348,7 +347,7 @@
 
                if(singleRequest)
                        requestMutex.destroy();
-       
+
 #ifdef ZTS
     tsrm_shutdown();
 #endif
@@ -385,7 +384,7 @@
 
        if(!req->ver.compare("HTTP/1.1") || !req->ver.compare("HTTPS/1.1"))
                SG(request_info).proto_num = 1001;
-       else 
+       else
                SG(request_info).proto_num = 1000;
 
        SG(server_context) = data = new PhpData();
@@ -423,7 +422,7 @@
                name = "html_errors";
                zend_alter_ini_entry(name, strlen(name), "0", 1, 
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
 
-       }       
+       }
 
        SG(request_info).post_data_length = SG(request_info).content_length;
 
@@ -432,23 +431,23 @@
        script.opened_path = NULL;
        script.free_filename = 0;
 
-       zend_first_try 
+       zend_first_try
        {
 
-               if (php_request_startup(TSRMLS_C) == FAILURE) 
+               if (php_request_startup(TSRMLS_C) == FAILURE)
                {
                        return FAILURE;
                }
 
                php_execute_script(&script TSRMLS_CC);
-               
+
                if(data->useChunks)
                        HttpDataHandler::appendDataToHTTPChannel(data->td,
                                                                                
                                                                                
                         0,
                                                                                
                                                                                
                         0,
-                                                                               
                                                                                
                         &(data->td->outputData), 
+                                                                               
                                                                                
                         &(data->td->outputData),
                                                                                
                                                                                
                         &(data->chain),
-                                                                               
                                                                                
                         (bool)data->td->appendOutputs, 
+                                                                               
                                                                                
                         (bool)data->td->appendOutputs,
                                                                                
                                                                                
                         data->useChunks);
 
                php_request_shutdown(NULL);

Modified: trunk/plugins/http_managers/php/php.h
===================================================================
--- trunk/plugins/http_managers/php/php.h       2008-09-13 18:44:13 UTC (rev 
2810)
+++ trunk/plugins/http_managers/php/php.h       2008-09-13 21:16:59 UTC (rev 
2811)
@@ -17,14 +17,14 @@
 #include <php_embed.h>
 
 #include <stdafx.h>
-#include <include/connection.h>
-#include <include/socket.h>
-#include <include/server.h>
-#include <include/semaphore.h>
-#include <include/mutex.h>
-#include <include/file.h>
-#include <include/files_utility.h>
-#include <include/http.h>
+#include <include/connection/connection.h>
+#include <include/socket/socket.h>
+#include <include/server/server.h>
+#include <include/base/sync/semaphore.h>
+#include <include/base/sync/mutex.h>
+#include <include/base/file/file.h>
+#include <include/base/file/files_utility.h>
+#include <include/protocol/http/http.h>
 
 #ifdef WIN32
 #define EXPORTABLE(x) x _declspec(dllexport);