Menu
▾
▴
mod-c-cvs — CVS reports of mod_c
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(38) |
Sep
(134) |
Oct
(30) |
Nov
(8) |
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
(14) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2009 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gonzalo A. <ga...@us...> - 2006-10-05 14:54:11
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11351/include Modified Files: Response.h Log Message: * Added support for apache output stream. Index: Response.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/Response.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Response.h 12 Sep 2006 00:26:47 -0000 1.4 --- Response.h 5 Oct 2006 14:53:59 -0000 1.5 *************** *** 24,27 **** --- 24,46 ---- #include "EHTMLApplication.h" + #include <iostream> + #include <streambuf> + class ApacheResponseStreamBuf: public std::streambuf { + request_rec* _r; + char _buf[256]; //TODO FIXME saving buffers in objects is not really wise + public: + ApacheResponseStreamBuf(request_rec* r); + virtual ~ApacheResponseStreamBuf(); + + virtual std::streamsize sputc(char c); + virtual std::streamsize sputn(char* s, std::streamsize n); + virtual std::streamsize sputn(const char* s, std::streamsize n); + protected: + virtual std::streamsize xsputn(char* s, std::streamsize n); + virtual std::streamsize xsputn(const char* s, std::streamsize n); + virtual int sync(); + virtual char overflow(char c = traits_type::eof()); + }; + /** * The wrapper for all response related configuration. *************** *** 47,50 **** --- 66,75 ---- void SetCookie(const std::string& name, const std::string& value); + /** + * Returns the response stream + * + */ + std::ostream& GetStream() { return _stream; } + protected: /** *************** *** 56,59 **** --- 81,92 ---- */ EHTMLApplication * Application; + /** + * The response stream + */ + std::ostream _stream; + /** + * The response streambuf + */ + ApacheResponseStreamBuf _buf; }; |
|
From: Gonzalo A. <ga...@us...> - 2006-10-05 14:54:08
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11351/src Modified Files: Response.cpp Log Message: * Added support for apache output stream. Index: Response.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Response.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Response.cpp 13 Sep 2006 13:57:07 -0000 1.4 --- Response.cpp 5 Oct 2006 14:53:59 -0000 1.5 *************** *** 25,30 **** Response::Response( EHTMLApplication * App ) ! : RequestContext( App->GetRequestContext() ), Application( App ) { } --- 25,32 ---- Response::Response( EHTMLApplication * App ) ! : RequestContext( App->GetRequestContext() ), Application( App ), ! _stream(&_buf), _buf(App->GetRequestContext()->r) { + _stream.rdbuf(&_buf); } *************** *** 36,37 **** --- 38,96 ---- } + ApacheResponseStreamBuf::ApacheResponseStreamBuf(request_rec* r): _r(r) { + setp(_buf, _buf + sizeof(_buf)); + } + + ApacheResponseStreamBuf::~ApacheResponseStreamBuf() { + sync(); + } + + streamsize ApacheResponseStreamBuf::sputc(char c) { + ProfileMe(); + return ap_rwrite(&c, 1, _r); + } + + streamsize ApacheResponseStreamBuf::sputn(char* s, streamsize n) { + return xsputn(const_cast<char*>(s), n); + } + + streamsize ApacheResponseStreamBuf::sputn(const char* s, streamsize n) { + return xsputn(s, n); + } + + streamsize ApacheResponseStreamBuf::xsputn(char* s, streamsize n) { + return xsputn(const_cast<char*>(s), n); + } + + streamsize ApacheResponseStreamBuf::xsputn(const char* s, streamsize n) { + ProfileMe(); + return ap_rwrite(s, n, _r); + } + + int ApacheResponseStreamBuf::sync() { + ProfileMe(); + streamsize pending (pptr() - pbase()); + int dev = 0; + + if (pending) { + streamsize nwrote = ap_rwrite(pbase(), pending, _r); + pbump(-nwrote); + if (nwrote != pending) + dev = -1; + } + return dev; + } + + char ApacheResponseStreamBuf::overflow(char c) { + ProfileMe(); + streamsize pending(pptr() - pbase()); + + if (pending && sync()) + return traits_type::eof(); + + if (c != traits_type::eof()) + ap_rwrite(&c, 1, _r); + + return c; + } + |
|
From: Gonzalo A. <ga...@us...> - 2006-10-05 14:53:05
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv10891/src Modified Files: EHTMLApplication.cpp Log Message: * Fixed debugging framework. Index: EHTMLApplication.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/EHTMLApplication.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** EHTMLApplication.cpp 4 Oct 2006 16:37:23 -0000 1.15 --- EHTMLApplication.cpp 5 Oct 2006 14:52:52 -0000 1.16 *************** *** 222,234 **** va_list l; va_start (l, fmt); ! Error(fmt, l); va_end(l); } void EHTMLApplication::Error(const char* fmt, va_list l) const { ! va_list l2; ! va_copy (l2, l); ! Log(APLOG_ERR, fmt, l2); ! va_end(l2); } --- 222,231 ---- va_list l; va_start (l, fmt); ! Log(APLOG_ERR, fmt, l); va_end(l); } void EHTMLApplication::Error(const char* fmt, va_list l) const { ! Log(APLOG_ERR, fmt, l); } *************** *** 240,243 **** --- 237,244 ---- } + void EHTMLApplication::Debug(const char* fmt, va_list l) const { + Log(APLOG_DEBUG, fmt, l); + } + static const char* prefix(int level) { switch (level) { |
|
From: Gonzalo A. <ga...@us...> - 2006-10-05 14:53:04
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv10891/include Modified Files: EHTMLApplication.h Log Message: * Fixed debugging framework. Index: EHTMLApplication.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/EHTMLApplication.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EHTMLApplication.h 12 Sep 2006 20:01:48 -0000 1.9 --- EHTMLApplication.h 5 Oct 2006 14:52:52 -0000 1.10 *************** *** 232,235 **** --- 232,240 ---- /** + * Debug logging method. + */ + void Debug(const char* fmt, va_list l) const; + + /** * Gets the current session */ |
|
From: Gonzalo A. <ga...@us...> - 2006-10-04 17:03:45
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1480/src Modified Files: Request.cpp Log Message: * Removed final EOL in debugging messages. Index: Request.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Request.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Request.cpp 17 Sep 2006 22:39:28 -0000 1.10 --- Request.cpp 4 Oct 2006 17:03:36 -0000 1.11 *************** *** 155,165 **** const string* Request::GetCookie(const string& name) const { ProfileMe(); ! Debug("Looking for %s\n", name.c_str()); string s = name + "="; for (HeaderEntryList::const_iterator i = HeaderCookies.begin(); i != HeaderCookies.end(); ++i) { ! Debug("cmp %s =? %s\n", name.c_str(), (*i)->Value); if (!strncmp((*i)->Value, s.c_str(), s.length())) { ! Debug("got it! (%s)\n", (*i)->Value + name.length()+1); cookies_returned.push_front(string((*i)->Value + name.length()+1)); return &*cookies_returned.begin(); --- 155,165 ---- const string* Request::GetCookie(const string& name) const { ProfileMe(); ! Debug("Looking for %s", name.c_str()); string s = name + "="; for (HeaderEntryList::const_iterator i = HeaderCookies.begin(); i != HeaderCookies.end(); ++i) { ! Debug("cmp %s =? %s", name.c_str(), (*i)->Value); if (!strncmp((*i)->Value, s.c_str(), s.length())) { ! Debug("got it! (%s)", (*i)->Value + name.length()+1); cookies_returned.push_front(string((*i)->Value + name.length()+1)); return &*cookies_returned.begin(); |
|
From: Gonzalo A. <ga...@us...> - 2006-10-04 16:37:28
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22439/src Modified Files: EHTMLApplication.cpp Log Message: * Fixed initialization order in EHTMLApplication. * on error, HTTP_INTERNAL_SERVER_ERROR is returned. Otherwise, the ehtml shared object is returned. * Removed unnecesary va_copy calls. Index: EHTMLApplication.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/EHTMLApplication.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** EHTMLApplication.cpp 21 Sep 2006 20:03:22 -0000 1.14 --- EHTMLApplication.cpp 4 Oct 2006 16:37:23 -0000 1.15 *************** *** 38,42 **** EHTMLApplication::EHTMLApplication( request_context * ReqContext ): ! RequestContext( ReqContext ), Request(NULL), Response(NULL), Page(NULL), driver(NULL), session(NULL) { --- 38,42 ---- EHTMLApplication::EHTMLApplication( request_context * ReqContext ): ! Request(NULL), Response(NULL), RequestContext(ReqContext), Page(NULL), driver(NULL), session(NULL) { *************** *** 83,87 **** error: ErrorCleanup(); ! return retVal; } --- 83,87 ---- error: ErrorCleanup(); ! return HTTP_INTERNAL_SERVER_ERROR; } *************** *** 171,175 **** if (session && driver) { ! Debug("Finish: session id=%s\n", session->ID().hex().c_str()); if (!driver->Save(session)) { Error("Error saving session (hex=%s): %s", --- 171,175 ---- if (session && driver) { ! Debug("Finish: session id=%s", session->ID().hex().c_str()); if (!driver->Save(session)) { Error("Error saving session (hex=%s): %s", *************** *** 227,231 **** void EHTMLApplication::Error(const char* fmt, va_list l) const { ! Log(APLOG_ERR, fmt, l); } --- 227,234 ---- void EHTMLApplication::Error(const char* fmt, va_list l) const { ! va_list l2; ! va_copy (l2, l); ! Log(APLOG_ERR, fmt, l2); ! va_end(l2); } *************** *** 254,263 **** void EHTMLApplication::Log(int level, const char* fmt, va_list l) const { ProfileMe(); ! char* msg = (char*)malloc(512); ! vsnprintf(msg, 511, fmt, l); ! msg[511] = '\0'; ap_log_error(APLOG_MARK, level, 0, RequestContext->r->server, "%s: %s", prefix(level), msg); free(msg); } --- 257,268 ---- void EHTMLApplication::Log(int level, const char* fmt, va_list l) const { ProfileMe(); ! char* msg = (char*)calloc(512,1); ! va_list l2; ! va_copy(l2, l); ! vsnprintf(msg, 511, fmt, l2); ap_log_error(APLOG_MARK, level, 0, RequestContext->r->server, "%s: %s", prefix(level), msg); + va_end(l2); free(msg); } |
|
From: Gonzalo A. <ga...@us...> - 2006-10-04 16:34:49
|
Update of /cvsroot/mod-c/ehtml/samples In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22045/samples Modified Files: 02session.cpp Log Message: Removed final EOL in debugging messages. Index: 02session.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/samples/02session.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 02session.cpp 12 Sep 2006 20:01:49 -0000 1.4 --- 02session.cpp 4 Oct 2006 16:34:44 -0000 1.5 *************** *** 65,69 **** lblCount.SetText("count = " + (*session)[COUNT]); ! Debug("Got session id=%s\n", session->ID().hex().c_str()); } --- 65,69 ---- lblCount.SetText("count = " + (*session)[COUNT]); ! Debug("Got session id=%s", session->ID().hex().c_str()); } |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 20:03:26
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3454/src Modified Files: EHTMLApplication.cpp Log Message: * Added missin initializations. Index: EHTMLApplication.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/EHTMLApplication.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EHTMLApplication.cpp 13 Sep 2006 13:57:06 -0000 1.13 --- EHTMLApplication.cpp 21 Sep 2006 20:03:22 -0000 1.14 *************** *** 37,42 **** using namespace std; ! EHTMLApplication::EHTMLApplication( request_context * ReqContext ) ! : RequestContext( ReqContext ) { ProfileMe(); --- 37,43 ---- using namespace std; ! EHTMLApplication::EHTMLApplication( request_context * ReqContext ): ! RequestContext( ReqContext ), Request(NULL), Response(NULL), ! Page(NULL), driver(NULL), session(NULL) { ProfileMe(); |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 19:21:20
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18953/src Modified Files: testCommon.cpp Log Message: * Removed harmless compiler warning. Index: testCommon.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/testCommon.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testCommon.cpp 13 Sep 2006 19:42:16 -0000 1.3 --- testCommon.cpp 21 Sep 2006 19:21:17 -0000 1.4 *************** *** 49,53 **** MemBuf mb; int fail = 0; ! for (int i = 0; i < NTEST; ++i) { printf("Testing encodings for %s\n", test[i][0]); s = urlencode(test[i][0]); --- 49,53 ---- MemBuf mb; int fail = 0; ! for (size_t i = 0; i < NTEST; ++i) { printf("Testing encodings for %s\n", test[i][0]); s = urlencode(test[i][0]); |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 17:24:33
|
Update of /cvsroot/mod-c/mod_c/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2596/include Modified Files: mod_c.h Log Message: * Added RINFO macro (log a message to error log with INFO level). Index: mod_c.h =================================================================== RCS file: /cvsroot/mod-c/mod_c/include/mod_c.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mod_c.h 21 Sep 2006 17:13:14 -0000 1.7 --- mod_c.h 21 Sep 2006 17:24:29 -0000 1.8 *************** *** 77,80 **** --- 77,81 ---- #define RWARNING(req, msg,...) RLOG(APLOG_WARNING, req, msg, ## __VA_ARGS__) #define RDEBUG(req, msg,...) RLOG(APLOG_DEBUG, req, msg, ## __VA_ARGS__) + #define RINFO(req, msg,...) RLOG(APLOG_INFO, req, msg, ## __VA_ARGS__) #define SDEBUG(req, msg,...) SLOG(APLOG_DEBUG, req, msg, ## __VA_ARGS__) |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 17:24:02
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2194/src Modified Files: mod_c.c Log Message: * Adapted remaining debugging messages. Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mod_c.c 21 Sep 2006 17:13:14 -0000 1.26 --- mod_c.c 21 Sep 2006 17:23:58 -0000 1.27 *************** *** 88,92 **** // We must handle this request ! RDEBUG(LOG_INFO, r, "The file to open: '%s'", r->filename); config = c_sconfig(r->server); dir_config = c_dconfig(r); --- 88,92 ---- // We must handle this request ! RINFO(r, "The file to open: '%s'", r->filename); config = c_sconfig(r->server); dir_config = c_dconfig(r); *************** *** 114,118 **** // Not cached || cached but stale if (e.entryf == NULL) { ! RDEBUG(LOG_ERR, r, "Loading %s", r->filename); msg = LoadAndCacheEHTML(config->ehtml_cache, r->filename, &e); if (msg != NULL) { --- 114,118 ---- // Not cached || cached but stale if (e.entryf == NULL) { ! RERROR(r, "Loading %s", r->filename); msg = LoadAndCacheEHTML(config->ehtml_cache, r->filename, &e); if (msg != NULL) { |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 17:20:04
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32746/include Modified Files: Session.h Log Message: * ehtml.h was not included when compiling mod_c.c, which defines EXTERNC. EXTERNC is needed in Session.h Index: Session.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/Session.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Session.h 17 Sep 2006 18:14:51 -0000 1.13 --- Session.h 21 Sep 2006 17:20:00 -0000 1.14 *************** *** 24,30 **** #include <time.h> #ifdef __cplusplus - #include "ehtml.h" #include "Plugin.h" #include "Dictionary.h" --- 24,31 ---- #include <time.h> + #include "ehtml.h" + #ifdef __cplusplus #include "Plugin.h" #include "Dictionary.h" |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 17:13:26
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29659/src Modified Files: mod_c.c Log Message: * Logging macros now depend on apache log level configuration, rather than on a compile time switch. Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mod_c.c 17 Sep 2006 18:40:41 -0000 1.25 --- mod_c.c 21 Sep 2006 17:13:14 -0000 1.26 *************** *** 117,121 **** msg = LoadAndCacheEHTML(config->ehtml_cache, r->filename, &e); if (msg != NULL) { ! RDEBUG(LOG_ERR, r, "Error caching %s: %s", r->filename, msg); return HTTP_INTERNAL_SERVER_ERROR; } --- 117,121 ---- msg = LoadAndCacheEHTML(config->ehtml_cache, r->filename, &e); if (msg != NULL) { ! RERROR(r, "Error caching %s: %s", r->filename, msg); return HTTP_INTERNAL_SERVER_ERROR; } |
|
From: Gonzalo A. <ga...@us...> - 2006-09-21 17:13:20
|
Update of /cvsroot/mod-c/mod_c/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29659/include Modified Files: mod_c.h Log Message: * Logging macros now depend on apache log level configuration, rather than on a compile time switch. Index: mod_c.h =================================================================== RCS file: /cvsroot/mod-c/mod_c/include/mod_c.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mod_c.h 8 Sep 2006 15:01:38 -0000 1.6 --- mod_c.h 21 Sep 2006 17:13:14 -0000 1.7 *************** *** 70,86 **** } ehtml_rec; ! #ifdef DEBUG ! ! #define RDEBUG(level,request,msg,...) \ ! SDEBUG(level, (request)->server, msg, ## __VA_ARGS__) ! #define SDEBUG(level,server,msg,...) \ ! ap_log_error(__FILE__, __LINE__, level, 0, server, msg, ## __VA_ARGS__) ! ! #else ! ! #define RDEBUG(level,request,msg,...) ! #define SDEBUG(level,server,msg,...) ! #endif #endif --- 70,81 ---- } ehtml_rec; ! #define SLOG(level,server,msg,...) \ ! ap_log_error(__FILE__, __LINE__, level, 0, server, msg, ## __VA_ARGS__) ! #define RLOG(level,req,msg,...) SLOG(level, (req)->server, msg, ## __VA_ARGS__) ! #define RERROR(req, msg,...) RLOG(APLOG_ERR, req, msg, ## __VA_ARGS__) ! #define RWARNING(req, msg,...) RLOG(APLOG_WARNING, req, msg, ## __VA_ARGS__) ! #define RDEBUG(req, msg,...) RLOG(APLOG_DEBUG, req, msg, ## __VA_ARGS__) ! #define SDEBUG(req, msg,...) SLOG(APLOG_DEBUG, req, msg, ## __VA_ARGS__) #endif |
|
From: Gonzalo A. <ga...@us...> - 2006-09-17 23:44:48
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17190/src Modified Files: Common.cpp Log Message: * Bypass yet another g++ bug. Index: Common.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Common.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Common.cpp 17 Sep 2006 23:40:01 -0000 1.13 --- Common.cpp 17 Sep 2006 23:44:45 -0000 1.14 *************** *** 327,331 **** if (ii >= dev.Size() - 2) throw "Invalid string to decode"; ! obuf[i] = GetByteFromHex(obuf[++ii], obuf[++ii]); } dev.resize(i); --- 327,333 ---- if (ii >= dev.Size() - 2) throw "Invalid string to decode"; ! char a = obuf[++ii]; ! char b = obuf[++ii]; ! obuf[i] = GetByteFromHex(a, b); } dev.resize(i); |
|
From: Gonzalo A. <ga...@us...> - 2006-09-17 23:40:05
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15153/src Modified Files: Common.cpp Log Message: * Bypass some stupid g++ bug: expressions should be evaluated from left to right. Index: Common.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Common.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Common.cpp 13 Sep 2006 18:58:15 -0000 1.12 --- Common.cpp 17 Sep 2006 23:40:01 -0000 1.13 *************** *** 358,363 **** if (s.length() & 1) throw "Invalid format"; ! for (size_t i = 0; i < s.length(); ++i) ! dev[i>>1] = GetByteFromHex(s[i], s[++i]); return dev; } --- 358,366 ---- if (s.length() & 1) throw "Invalid format"; ! for (size_t i = 0; i < s.length(); ++i) { ! char a = s[i]; ! char b = s[++i]; ! dev[i>>1] = GetByteFromHex(a, b); ! } return dev; } |
|
From: Gonzalo A. <ga...@us...> - 2006-09-17 23:10:12
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3103/src Modified Files: DiskSessionDriver.cpp Log Message: * Fixed a typo in debugging messages. Index: DiskSessionDriver.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/DiskSessionDriver.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DiskSessionDriver.cpp 13 Sep 2006 18:58:15 -0000 1.5 --- DiskSessionDriver.cpp 17 Sep 2006 23:10:07 -0000 1.6 *************** *** 124,128 **** string lname = locked_filename(id); if (rename(name.c_str(), lname.c_str())) { ! Application()->Error("stale session (id=%s, rename error=%s)\n", id.hex().c_str(), strerror(errno)); return NULL; --- 124,128 ---- string lname = locked_filename(id); if (rename(name.c_str(), lname.c_str())) { ! Application()->Error("stale session (id=%s, rename error=%s)", id.hex().c_str(), strerror(errno)); return NULL; *************** *** 133,137 **** in >> *dev; } catch (const char*) { ! Application()->Error("corrupt session state (id=%s)\n", id.hex().c_str()); delete dev; --- 133,137 ---- in >> *dev; } catch (const char*) { ! Application()->Error("corrupt session state (id=%s)", id.hex().c_str()); delete dev; *************** *** 139,143 **** } if (!in.eof()) { ! Application()->Error("corrupt session state (id=%s)\n", id.hex().c_str()); delete dev; --- 139,143 ---- } if (!in.eof()) { ! Application()->Error("corrupt session state (id=%s)", id.hex().c_str()); delete dev; |
|
From: Gonzalo A. <ga...@us...> - 2006-09-17 22:39:34
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23378/src Modified Files: Request.cpp Log Message: * Removed spurious debugging messages. Index: Request.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Request.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Request.cpp 13 Sep 2006 13:57:07 -0000 1.9 --- Request.cpp 17 Sep 2006 22:39:28 -0000 1.10 *************** *** 173,177 **** ProfileMe(); const apr_array_header_t* arr = apr_table_elts( RequestContext->r->headers_in ); - Debug("%s:%d\n", __PRETTY_FUNCTION__, __LINE__); if ( arr->nelts > 0 ) { --- 173,176 ---- *************** *** 187,191 **** if ( _key ) { - Debug("Parsing %s\n", _key); switch ( _key[0] ) { --- 186,189 ---- *************** *** 206,210 **** if ( strncmp( "kie", _tmp + 1, 3 ) == 0 ) // We have a cookie - Debug("Got cookie %s => %s\n", tmp->key, tmp->val); HeaderCookies.push_back( new HeaderEntry(tmp->key, tmp->val)); } --- 204,207 ---- |
|
From: Matej U. <mat...@us...> - 2006-09-17 18:40:45
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26677/src Modified Files: ChangeLog mod_c.c Log Message: On demand loading works now. Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mod_c.c 15 Sep 2006 10:38:25 -0000 1.24 --- mod_c.c 17 Sep 2006 18:40:41 -0000 1.25 *************** *** 69,74 **** static int CHandler( request_rec *r ) { ! mod_c_config * config; ! mod_c_dir_config* dir_config; int retVal; ehtml_rec e = { NULL, NULL, 0, 0 }; --- 69,74 ---- static int CHandler( request_rec *r ) { ! mod_c_config * config; ! mod_c_dir_config* dir_config; int retVal; ehtml_rec e = { NULL, NULL, 0, 0 }; *************** *** 97,101 **** // Are we allowed to serve on demand requests? ! if (!config->allow_on_demand) return HTTP_SERVICE_UNAVAILABLE; --- 97,101 ---- // Are we allowed to serve on demand requests? ! if (!config->allow_on_demand || LoadAndCacheEHTML(config->ehtml_cache, r->filename, &e) < 0) return HTTP_SERVICE_UNAVAILABLE; *************** *** 124,131 **** // We have found the library that contains the EHTML application // execute its ehtml_run function ! ehtml_run_func _tmp = ( ehtml_run_func ) e.entryf; ! request_context rc = { r, config, dir_config }; ! retVal = _tmp( &rc ); ! return retVal; } --- 124,131 ---- // We have found the library that contains the EHTML application // execute its ehtml_run function ! ehtml_run_func _tmp = ( ehtml_run_func ) e.entryf; ! request_context rc = { r, config, dir_config }; ! retVal = _tmp( &rc ); ! return retVal; } *************** *** 172,190 **** static void * CCreateDirConfig(apr_pool_t *p, char *dir) { ! mod_c_dir_config * dir_config = (mod_c_dir_config *) apr_palloc( p, sizeof( mod_c_dir_config ) ); ! ! dir_config->dir = dir;//( dir ) ? dir : root_dir_id; ! // Disable sessions by default... ! dir_config->sessions = 0; ! // Set the default duration of a session ! dir_config->session_duration = 10080 /* DEF_SESSION_DURATION*/; ! // Set the default session management type ! dir_config->session_funcs = 0; ! // Set the default cookieless setting ! dir_config->cookieless = 0; ! // Set the default key size setting ! dir_config->key_size = 64 /*DEF_ID_SIZE*/; ! ! return dir_config; } --- 172,190 ---- static void * CCreateDirConfig(apr_pool_t *p, char *dir) { ! mod_c_dir_config * dir_config = (mod_c_dir_config *) apr_palloc( p, sizeof( mod_c_dir_config ) ); ! ! dir_config->dir = dir;//( dir ) ? dir : root_dir_id; ! // Disable sessions by default... ! dir_config->sessions = 0; ! // Set the default duration of a session ! dir_config->session_duration = 10080 /* DEF_SESSION_DURATION*/; ! // Set the default session management type ! dir_config->session_funcs = 0; ! // Set the default cookieless setting ! dir_config->cookieless = 0; ! // Set the default key size setting ! dir_config->key_size = 64 /*DEF_ID_SIZE*/; ! ! return dir_config; } *************** *** 204,214 **** static void * CCreateServerConfig( apr_pool_t *p, server_rec *s ) { ! mod_c_config * config = ( mod_c_config* ) apr_palloc ( p, sizeof( mod_c_config ) ); ! // Initialize the caches (both for session drivers and ehtml files) ! config->ehtml_cache = CreateEHTMLCache(); ! //config->session_drivers = InitSessionDrivers(); ! //config->enable_remote_sessions = 0; ! //config->session_server_port = -1; ! //config->disable_session_server = 0; config->allow_on_demand = 0; config->allow_auto_refresh = 0; --- 204,214 ---- static void * CCreateServerConfig( apr_pool_t *p, server_rec *s ) { ! mod_c_config * config = ( mod_c_config* ) apr_palloc ( p, sizeof( mod_c_config ) ); ! // Initialize the caches (both for session drivers and ehtml files) ! config->ehtml_cache = CreateEHTMLCache(); ! //config->session_drivers = InitSessionDrivers(); ! //config->enable_remote_sessions = 0; ! //config->session_server_port = -1; ! //config->disable_session_server = 0; config->allow_on_demand = 0; config->allow_auto_refresh = 0; *************** *** 219,223 **** // "Error message: '%s'", retVal ); ! return config; } --- 219,223 ---- // "Error message: '%s'", retVal ); ! return config; } *************** *** 227,231 **** static int CPostConfig(apr_pool_t *pconf,apr_pool_t *plog, apr_pool_t *ptemp,server_rec *s) { ! return OK; } --- 227,231 ---- static int CPostConfig(apr_pool_t *pconf,apr_pool_t *plog, apr_pool_t *ptemp,server_rec *s) { ! return OK; } *************** *** 244,251 **** static void CRegisterHooks( apr_pool_t * pool ) { ! // We like the middle, don't we? ! ap_hook_handler( CHandler, NULL, NULL, APR_HOOK_MIDDLE ); ! ap_hook_post_config( CPostConfig, NULL, NULL, APR_HOOK_MIDDLE ); ! ap_hook_child_init( CChildInit, NULL, NULL, APR_HOOK_MIDDLE ); } --- 244,251 ---- static void CRegisterHooks( apr_pool_t * pool ) { ! // We like the middle, don't we? ! ap_hook_handler( CHandler, NULL, NULL, APR_HOOK_MIDDLE ); ! ap_hook_post_config( CPostConfig, NULL, NULL, APR_HOOK_MIDDLE ); ! ap_hook_child_init( CChildInit, NULL, NULL, APR_HOOK_MIDDLE ); } *************** *** 270,286 **** static char* LoadEHTMLDirective( cmd_parms* parms, void *mconfig, const char * path ) { ! mod_c_config * config = c_sconfig(parms->server); ehtml_rec e; const char* msg = LoadAndCacheEHTML(config->ehtml_cache, path, &e); if (msg != NULL) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTML: Could not load the specified file '%s'. " "Error: '%s'.", path, msg); ! return errorMsg; ! } ! else ! return 0; } --- 270,286 ---- static char* LoadEHTMLDirective( cmd_parms* parms, void *mconfig, const char * path ) { ! mod_c_config * config = c_sconfig(parms->server); ehtml_rec e; const char* msg = LoadAndCacheEHTML(config->ehtml_cache, path, &e); if (msg != NULL) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTML: Could not load the specified file '%s'. " "Error: '%s'.", path, msg); ! return errorMsg; ! } ! else ! return 0; } *************** *** 305,311 **** { if (registerSessionDriver(name, path) < 0) { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionDriver: Could not load the session driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); ! return errorMsg; } return NULL; --- 305,311 ---- { if (registerSessionDriver(name, path) < 0) { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionDriver: Could not load the session driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); ! return errorMsg; } return NULL; *************** *** 318,324 **** { if (registerSessionIDDriver(name, path) < 0) { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionIDDriver: Could not load the session id driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); ! return errorMsg; } return NULL; --- 318,324 ---- { if (registerSessionIDDriver(name, path) < 0) { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "LoadEHTMLSessionIDDriver: Could not load the session id driver '%s' in '%s'. Error message: %s / %s", name, path, dlerror(), strerror(errno)); ! return errorMsg; } return NULL; *************** *** 330,336 **** static char * EHTMLSessionsDirective( cmd_parms * parms, void *mconfig, int on) { ! mod_c_dir_config* dir_config = (mod_c_dir_config*) ap_get_module_config( parms->context, &c_module ); ! dir_config->sessions = ( on != 0 ); ! return 0; } --- 330,336 ---- static char * EHTMLSessionsDirective( cmd_parms * parms, void *mconfig, int on) { ! mod_c_dir_config* dir_config = (mod_c_dir_config*) ap_get_module_config( parms->context, &c_module ); ! dir_config->sessions = ( on != 0 ); ! return 0; } *************** *** 340,356 **** static char * EHTMLSessionDurationDirective( cmd_parms* parms, void *mconfig, const char * minutes ) { ! int mins = atoi( minutes ); ! if ( mins < 1 ) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionDuration: Please specify a positive integer." ); ! return errorMsg; ! } ! else ! { ! mod_c_dir_config* dir_config = (mod_c_dir_config*) ap_get_module_config( parms->context, &c_module ); ! dir_config->session_duration = mins; ! return 0; ! } } --- 340,356 ---- static char * EHTMLSessionDurationDirective( cmd_parms* parms, void *mconfig, const char * minutes ) { ! int mins = atoi( minutes ); ! if ( mins < 1 ) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionDuration: Please specify a positive integer." ); ! return errorMsg; ! } ! else ! { ! mod_c_dir_config* dir_config = (mod_c_dir_config*) ap_get_module_config( parms->context, &c_module ); ! dir_config->session_duration = mins; ! return 0; ! } } *************** *** 397,403 **** static char * EHTMLCookielessDirective( cmd_parms * parms, void *mconfig, int on) { ! mod_c_dir_config* dir_config = c_pconfig(parms); ! dir_config->cookieless = ( on != 0 ); ! return 0; } --- 397,403 ---- static char * EHTMLCookielessDirective( cmd_parms * parms, void *mconfig, int on) { ! mod_c_dir_config* dir_config = c_pconfig(parms); ! dir_config->cookieless = ( on != 0 ); ! return 0; } *************** *** 407,428 **** static char * EHTMLSessionIdSizeDirective( cmd_parms* parms, void *mconfig, const char * size ) { ! int bytes = atoi( size ); ! if ( bytes < 0 ) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionIdSize: Please specify a positive integer." ); ! return errorMsg; ! } ! else ! { ! mod_c_dir_config* dir_config = c_pconfig(parms); ! dir_config->key_size = bytes; ! return 0; ! } } command_rec c_commands[] = { ! AP_INIT_TAKE1("LoadEHTML", (void*)LoadEHTMLDirective, NULL, RSRC_CONF, "Arguments: a valid absolute path to an ehtml file. " "If you change the ehtml file in time the server is running, " --- 407,428 ---- static char * EHTMLSessionIdSizeDirective( cmd_parms* parms, void *mconfig, const char * size ) { ! int bytes = atoi( size ); ! if ( bytes < 0 ) ! { ! char * errorMsg = ( char * ) apr_palloc( parms->temp_pool, 512 ); ! snprintf( errorMsg, 512, "EHTMLSessionIdSize: Please specify a positive integer." ); ! return errorMsg; ! } ! else ! { ! mod_c_dir_config* dir_config = c_pconfig(parms); ! dir_config->key_size = bytes; ! return 0; ! } } command_rec c_commands[] = { ! AP_INIT_TAKE1("LoadEHTML", (void*)LoadEHTMLDirective, NULL, RSRC_CONF, "Arguments: a valid absolute path to an ehtml file. " "If you change the ehtml file in time the server is running, " *************** *** 440,465 **** // Session directives ! AP_INIT_TAKE2("LoadEHTMLSessionDriver", (void*)LoadEHTMLSessionDriver, NULL, RSRC_CONF, "Driver name and a valid absolute path to a session driver file." ), ! AP_INIT_TAKE2("LoadEHTMLSessionIDDriver", (void*)LoadEHTMLSessionIDDriver, NULL, RSRC_CONF, "Driver name and a valid absolute path to a session driver file." ), ! AP_INIT_FLAG("EHTMLSessions", (void*)EHTMLSessionsDirective, NULL, OR_LIMIT, "< on | off > - 'on' enables sessions while 'off' " "disables them." ), ! AP_INIT_TAKE1("EHTMLSessionDuration", (void*)EHTMLSessionDurationDirective, NULL, OR_LIMIT, "Specify the number of minutes, default is 30 " "minutes." ), ! AP_INIT_TAKE12("EHTMLSessionType", (void*)EHTMLSessionTypeDirective, NULL, OR_LIMIT, "< type > [ arguments ] - the first parameter is " "mandatory, while the second one is needed only if the selected " "type of session management needs it." ), ! AP_INIT_TAKE12("EHTMLSessionIDType", (void*)EHTMLSessionIDTypeDirective, NULL, OR_LIMIT, "< type > [ arguments ] - the first parameter is " --- 440,465 ---- // Session directives ! AP_INIT_TAKE2("LoadEHTMLSessionDriver", (void*)LoadEHTMLSessionDriver, NULL, RSRC_CONF, "Driver name and a valid absolute path to a session driver file." ), ! AP_INIT_TAKE2("LoadEHTMLSessionIDDriver", (void*)LoadEHTMLSessionIDDriver, NULL, RSRC_CONF, "Driver name and a valid absolute path to a session driver file." ), ! AP_INIT_FLAG("EHTMLSessions", (void*)EHTMLSessionsDirective, NULL, OR_LIMIT, "< on | off > - 'on' enables sessions while 'off' " "disables them." ), ! AP_INIT_TAKE1("EHTMLSessionDuration", (void*)EHTMLSessionDurationDirective, NULL, OR_LIMIT, "Specify the number of minutes, default is 30 " "minutes." ), ! AP_INIT_TAKE12("EHTMLSessionType", (void*)EHTMLSessionTypeDirective, NULL, OR_LIMIT, "< type > [ arguments ] - the first parameter is " "mandatory, while the second one is needed only if the selected " "type of session management needs it." ), ! AP_INIT_TAKE12("EHTMLSessionIDType", (void*)EHTMLSessionIDTypeDirective, NULL, OR_LIMIT, "< type > [ arguments ] - the first parameter is " *************** *** 467,489 **** "type of session management needs it." ), ! AP_INIT_FLAG("EHTMLCookieless", (void*)EHTMLCookielessDirective, NULL, OR_LIMIT, "< on | off > - 'on' disables cookies while 'off' " "enables them." ), ! AP_INIT_TAKE1("EHTMLSessionIdSize", (void*)EHTMLSessionIdSizeDirective, NULL, OR_LIMIT, "The number of bytes" ), ! { NULL } }; module c_module = { ! STANDARD20_MODULE_STUFF, ! CCreateDirConfig, ! NULL, ! CCreateServerConfig, ! NULL, ! c_commands, ! CRegisterHooks }; --- 467,489 ---- "type of session management needs it." ), ! AP_INIT_FLAG("EHTMLCookieless", (void*)EHTMLCookielessDirective, NULL, OR_LIMIT, "< on | off > - 'on' disables cookies while 'off' " "enables them." ), ! AP_INIT_TAKE1("EHTMLSessionIdSize", (void*)EHTMLSessionIdSizeDirective, NULL, OR_LIMIT, "The number of bytes" ), ! { NULL } }; module c_module = { ! STANDARD20_MODULE_STUFF, ! CCreateDirConfig, ! NULL, ! CCreateServerConfig, ! NULL, ! c_commands, ! CRegisterHooks }; Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 15 Sep 2006 10:38:25 -0000 1.5 --- ChangeLog 17 Sep 2006 18:40:41 -0000 1.6 *************** *** 1,2 **** --- 1,6 ---- + 2006-09-17 Matej Urbas <mat...@gm...> + + * mod_c.c: Implemented on demand loading of EHTML files. + 2006-09-15 Matej Urbas <mat...@gm...> |
|
From: Matej U. <mat...@us...> - 2006-09-17 18:14:57
|
Update of /cvsroot/mod-c/ehtml/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16193/include Modified Files: ChangeLog Profiling.h Session.h ehtml.h Log Message: Made profiling optional. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 12 Sep 2006 23:11:58 -0000 1.4 --- ChangeLog 17 Sep 2006 18:14:51 -0000 1.5 *************** *** 1,2 **** --- 1,9 ---- + 2006-09-17 Matej Urbas <mat...@gm...> + + * ehtml.h: Moved the definition of EXTERNC into ehtml.h + * Profiling.h: Made ProfileMe et al optional (depending upon the + WITH_PROFILING macro). + * Session.h: Removed EXTERNC (is now in ehtml.h). + 2006-09-13 Matej Urbas <mat...@gm...> Index: ehtml.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/ehtml.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ehtml.h 8 Sep 2006 14:26:32 -0000 1.19 --- ehtml.h 17 Sep 2006 18:14:51 -0000 1.20 *************** *** 38,41 **** --- 38,47 ---- #define EHTML_INVALID_CALL -3 /** Invalid call */ + #ifdef __cplusplus + #define EXTERNC extern "C" + #else /* #ifdef __cplusplus */ + #define EXTERNC + #endif + /** * The name of the entry function of ehtml files. Index: Profiling.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/Profiling.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Profiling.h 13 Sep 2006 14:59:50 -0000 1.6 --- Profiling.h 17 Sep 2006 18:14:51 -0000 1.7 *************** *** 7,10 **** --- 7,18 ---- #define MAX_DEPTH 512 + #ifndef EXTERNC + #ifdef __cplusplus + #define EXTERNC extern "C" + #else /* #ifdef __cplusplus */ + #define EXTERNC + #endif + #endif + typedef int64_t hrtime_t; *************** *** 67,70 **** --- 75,79 ---- }; + #ifdef WITH_PROFILING /** * This makes easy to profile a function, simply add the line *************** *** 80,87 **** static ProfileFunction __profile((name), __FILE__, __LINE__);\ ProfileRun __profile_run(&__profile); ! #define EXTERNC extern "C" ! #else /* #ifdef __cplusplus */ ! #define EXTERNC #endif /* #ifdef __cplusplus */ --- 89,100 ---- static ProfileFunction __profile((name), __FILE__, __LINE__);\ ProfileRun __profile_run(&__profile); + #else + #define ProfileMe() + #define ProfileMeName(name) + #endif ! // #define EXTERNC extern "C" ! // #else /* #ifdef __cplusplus */ ! // #define EXTERNC #endif /* #ifdef __cplusplus */ Index: Session.h =================================================================== RCS file: /cvsroot/mod-c/ehtml/include/Session.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Session.h 12 Sep 2006 15:23:32 -0000 1.12 --- Session.h 17 Sep 2006 18:14:51 -0000 1.13 *************** *** 162,168 **** virtual bool Release(Session*) = 0; }; ! #define EXTERNC extern "C" ! #else /* ifdef __cplusplus */ ! #define EXTERNC extern #endif --- 162,168 ---- virtual bool Release(Session*) = 0; }; ! // #define EXTERNC extern "C" ! // #else /* ifdef __cplusplus */ ! // #define EXTERNC extern #endif |
|
From: Matej U. <mat...@us...> - 2006-09-17 18:14:57
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16193/src Modified Files: ChangeLog Makefile.am Session.cpp Log Message: Made profiling optional. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 13 Sep 2006 19:42:16 -0000 1.10 --- Makefile.am 17 Sep 2006 18:14:51 -0000 1.11 *************** *** 10,14 **** HTTPD_INCLUDE_DIR = @APACHE_LOCATION@ INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(srcdir)/../include ! AM_CXXFLAGS = $(INCLUDE_DIRS) -Wall lib_LTLIBRARIES = libehtml.la libsession.la libdisksession.la libsessionid.la --- 10,14 ---- HTTPD_INCLUDE_DIR = @APACHE_LOCATION@ INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(srcdir)/../include ! AM_CXXFLAGS = $(INCLUDE_DIRS) -Wall $(WITH_PROFILING) lib_LTLIBRARIES = libehtml.la libsession.la libdisksession.la libsessionid.la Index: Session.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Session.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Session.cpp 13 Sep 2006 18:58:15 -0000 1.17 --- Session.cpp 17 Sep 2006 18:14:51 -0000 1.18 *************** *** 19,23 **** ***************************************************************************/ ! #include <Common.h> #include "Session.h" #include <Request.h> --- 19,23 ---- ***************************************************************************/ ! #include "Common.h" #include "Session.h" #include <Request.h> Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 12 Sep 2006 23:11:58 -0000 1.4 --- ChangeLog 17 Sep 2006 18:14:51 -0000 1.5 *************** *** 1,2 **** --- 1,7 ---- + 2006-09-17 Matej Urbas <mat...@gm...> + + * Makefile.am: Added WITH_PROFILING macro - which enables optional + profiling. + 2006-09-13 Matej Urbas <mat...@gm...> |
|
From: Matej U. <mat...@us...> - 2006-09-17 18:14:57
|
Update of /cvsroot/mod-c/ehtml/samples In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16193/samples Modified Files: ChangeLog Makefile.am Log Message: Made profiling optional. Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/ehtml/samples/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 15 Sep 2006 10:37:05 -0000 1.5 --- Makefile.am 17 Sep 2006 18:14:51 -0000 1.6 *************** *** 3,7 **** HTTPD_INCLUDE_DIR = @APACHE_LOCATION@ INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(srcdir)/../include ! AM_CXXFLAGS = $(INCLUDE_DIRS) # g++ \ --- 3,7 ---- HTTPD_INCLUDE_DIR = @APACHE_LOCATION@ INCLUDE_DIRS = -I$(APR_0_INCLUDE) -I$(HTTPD_INCLUDE_DIR) -I$(srcdir)/../include ! AM_CXXFLAGS = $(INCLUDE_DIRS) -Wall $(WITH_PROFILING) # g++ \ Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/samples/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ChangeLog 15 Sep 2006 10:37:05 -0000 1.2 --- ChangeLog 17 Sep 2006 18:14:51 -0000 1.3 *************** *** 1,2 **** --- 1,7 ---- + 2006-09-17 Matej Urbas <mat...@gm...> + + * Makefile.am: Added WITH_PROFILING macro - which enables optional + profiling. + 2006-09-15 Matej Urbas <mat...@gm...> |
|
From: Matej U. <mat...@us...> - 2006-09-17 18:14:57
|
Update of /cvsroot/mod-c/ehtml In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16193 Modified Files: configure.in Log Message: Made profiling optional. Index: configure.in =================================================================== RCS file: /cvsroot/mod-c/ehtml/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 15 Sep 2006 10:37:05 -0000 1.7 --- configure.in 17 Sep 2006 18:14:51 -0000 1.8 *************** *** 111,114 **** --- 111,134 ---- ############################################################################## + ############################# Enable profiling ############################# + + AC_ARG_ENABLE( profiling, + AS_HELP_STRING([--enable-profiling], + [build EHTML with profiling enabled]), + [WITH_PROFILING="$enableval"], + [WITH_PROFILING="no"]) + + if test ${WITH_PROFILING} = "yes"; then + WITH_PROFILING="-DWITH_PROFILING" + AC_MSG_NOTICE([Will build with profiling...]) + else + WITH_PROFILING= + AC_MSG_NOTICE([Will not build with profiling...]) + fi; + + AC_SUBST(WITH_PROFILING) + + ############################################################################## + ################ Enable building and installing of samples ################ |
|
From: Matej U. <mat...@us...> - 2006-09-15 10:38:28
|
Update of /cvsroot/mod-c/mod_c/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17033/src Modified Files: ChangeLog mod_c.c Log Message: Fixed a wrong check of failure. Index: mod_c.c =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/mod_c.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mod_c.c 13 Sep 2006 14:58:36 -0000 1.23 --- mod_c.c 15 Sep 2006 10:38:25 -0000 1.24 *************** *** 93,97 **** // Try to load the handle to the loaded library from the cache ! if (GetEHTMLEntry(config->ehtml_cache, r->filename, &e) <= 0) { // If it was not present in cache --- 93,97 ---- // Try to load the handle to the loaded library from the cache ! if (GetEHTMLEntry(config->ehtml_cache, r->filename, &e) < 0) { // If it was not present in cache Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 12 Sep 2006 22:42:07 -0000 1.4 --- ChangeLog 15 Sep 2006 10:38:25 -0000 1.5 *************** *** 1,2 **** --- 1,6 ---- + 2006-09-15 Matej Urbas <mat...@gm...> + + * mod_c.c: Fixed the fail-check. + 2006-08-25 Gonzalo Arana <gon...@gm...> |
|
From: Matej U. <mat...@us...> - 2006-09-15 10:37:08
|
Update of /cvsroot/mod-c/ehtml In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16225 Modified Files: ChangeLog Makefile.am configure.in Log Message: Samples are optionally installable now. Index: ChangeLog =================================================================== RCS file: /cvsroot/mod-c/ehtml/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 8 Sep 2006 21:01:29 -0000 1.5 --- ChangeLog 15 Sep 2006 10:37:05 -0000 1.6 *************** *** 1,2 **** --- 1,6 ---- + 2006-09-15 Matej Urbas <mat...@gm...> + + * configure.in: Added support for optional installation of EHTML + samples. 2006-09-08 Gonzalo A. Arana <gon...@gm...> Index: Makefile.am =================================================================== RCS file: /cvsroot/mod-c/ehtml/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 23 Aug 2006 16:22:36 -0000 1.4 --- Makefile.am 15 Sep 2006 10:37:05 -0000 1.5 *************** *** 1,3 **** ! SUBDIRS = src include samples $(DOXYGEN_SUBDIR) --- 1,3 ---- ! SUBDIRS = src include $(EHTML_SAMPLES) $(DOXYGEN_SUBDIR) Index: configure.in =================================================================== RCS file: /cvsroot/mod-c/ehtml/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure.in 23 Aug 2006 16:12:12 -0000 1.6 --- configure.in 15 Sep 2006 10:37:05 -0000 1.7 *************** *** 111,114 **** --- 111,134 ---- ############################################################################## + ################ Enable building and installing of samples ################ + + AC_ARG_ENABLE( samples, + AS_HELP_STRING([--enable-samples], + [install EHTML samples too]), + [EHTML_SAMPLES="$enableval"], + [EHTML_SAMPLES="no"]) + + if test ${EHTML_SAMPLES} = "yes"; then + EHTML_SAMPLES="samples" + AC_MSG_NOTICE([Will install samples...]) + else + EHTML_SAMPLES= + AC_MSG_NOTICE([Will not install samples...]) + fi; + + AC_SUBST(EHTML_SAMPLES) + + ############################################################################## + AC_CONFIG_FILES([Makefile src/Makefile |
