tagging ychat-0.7.9.1ychat-0.7.9.1

11 files changed, 64 insertions, 37 deletions

diff --git a/CHANGES b/CHANGES
index 6fdf12e..899b707 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+-Changes from 0.7.9-RELEASE to 0.7.9.1-RELEASE -
+$ Fixed etc/ychat.conf (Its now valid XML)
+$ Fixed some typos.
+$ Added the scripts/makedist.sh script, which can be invoked by gmake dist. 
+$ yhttpd.org has been renamed to yChat.org. The yhttpd.org SLD will be
+$ canceled! The yhttpd.org Homepage will remain on yChat.org!
+
 -Changes from 0.7.8-RELEASE to 0.7.9-RELEASE -
 $ In the system messages will be the user printed which has requested the
   specified module.
diff --git a/Makefile b/Makefile
index 3194650..b3c5ca8 100755
--- a/Makefile
+++ b/Makefile
@@ -84,3 +84,5 @@ debug:
 	@gdb bin/ychat ychat.core
 confdebug:
 	./configure -g3 -ggdb
+dist:
+	@./scripts/makedist.sh
diff --git a/NEWS b/NEWS
index 87f9e19..85755c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+::(07.04.05)::Released yChat 0.7.9.1. This release only includes some minor bugfixes. The ychat.conf file is now valid XML. Also some typos have been fixed. 
 ::(10.03.05)::Released yChat 0.7.9. The logging capability has been improved. All chat command requests will be logged. The ncurses interface has been improved. Some code has been cleaned up. 
 ::(07.03.05)::Released yChat 0.5.4. This is a STABLERELEASE. The HTTP parsing methods have been backported from yChat 0.7.8. Also some minor bugfixes were made.This is the first STABLERELEASE of yChat ever.
 ::(05.03.05)::Released yChat 0.7.8. This release includes an IP cache for more speed. An UNIX signal catcher class has been added. SIGUSR1 and SIGUSR2 now clean the template cache or reload all dynamic modules. Added "Allow" to the HTTPD header. Also, lots of Bugfixes and minor improvements were made. Changed the 0.5 branch into STABLE. The 0.5.4-STABLERELEASE will follow next week. The ychat-stable CVS branch has been opened, which now points to ychat-0.5.
diff --git a/README b/README
index 75498f2..5b72fd5 100755
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-yChat; Homepage: www.yChat.org; Version 0.7.9-RELEASE
+yChat; Homepage: www.yChat.org; Version 0.7.9.1-RELEASE
 
 Copyright (C) 2003 Paul C. Buetow, Volker Richter
 Copyright (C) 2004, 2005 Paul C. Buetow
@@ -53,7 +53,7 @@ apache. yhttpd is a subset of the chat. It can be generated using the
 srcipts/yhttpdbase.pl script in the chat's source tree.
 
 - The ycurses -
-ycurses is a easy to use and small C++ wrapper of the C ncurses API. The
+ycurses is a easy to use and small C++ wrapper of the C ncurses API. 
 
 There are different branches:
 
diff --git a/RELEASES b/RELEASES
index 1d5895a..17a3ce4 100644
--- a/RELEASES
+++ b/RELEASES
@@ -1,33 +1,35 @@
 Release table 
 
-Release date	Branch				Release focus 
+Release date	Release name and version	Release focus 
 
-Planing:	yXML 0.1-RELEASE_________	Initial release
-Planing:	yhttpd 0.7.2-RELEASE_____	Features
-Planing:	yChat 0.7.9-RELEASE______	N/A
+Planing:	yhttpd 0.8-RELEASE_______	Features
+Planing:	yChat 0.8-RELEASE________	Features
+Planing:	ycurses 0.1-RELEASE______	Initial release
 
-Mar 08th 05:	yChat 0.5.4-STABLERELEASE	Minor improvements	
-Mar 05th 05	yChat 0.7.8-RELEASE______	Features
-Mar 02th 05	yChat 0.5.3-LEGACYRELEASE	Minor improvements	
-Feb 27th 05	yChat 0.5.2-LEGACYRELEASE	Bugfixes, code cleanup
-Feb 24th 05	yChat 0.7.7.1-RELEASE____	Bugfix
-Feb 21th 05	yChat 0.7.7-RELEASE______	Code cleanup		
-Feb 18th 05	yChat 0.7.6-RELEASE______	Improvements	
-Feb 15th 05	yChat 0.7.5-RELEASE______	Features, bugfixes	
-Feb 14th 05	yChat 0.7.4.1-RELEASE____	Bugfix	
-Feb 12th 05	yChat 0.7.4-RELEASE______	Bugfixes, improvements, feat. 
-Feb 10th 05	yChat 0.7.4-PRERELEASE___	Bugfixes, improvements, feat.  
-Dec 29th 04	yChat 0.7.3-RELEASE______	Bugfixes, features
-Nov 09th 04	yChat 0.7.2-RELEASE______	Bugfixes, features
-Nov 06th 04	yhttpd 0.7.1-RELEASE_____	Bugfixes	
-Nov 06th 04	yChat 0.7.1-RELEASE______	Bugfixes	
+Apr 07th 05:	yChat 0.7.9.1-RELEASE____	Minor bugfixes
+Mar 11th 05:	yChat 0.7.9-RELEASE______	
+Mar 08th 05:	yChat 0.5.4-STABLERELEASE
+Mar 05th 05	yChat 0.7.8-RELEASE______
+Mar 02th 05	yChat 0.5.3-LEGACYRELEASE
+Feb 27th 05	yChat 0.5.2-LEGACYRELEASE
+Feb 24th 05	yChat 0.7.7.1-RELEASE____	Major bugfixes
+Feb 21th 05	yChat 0.7.7-RELEASE______
+Feb 18th 05	yChat 0.7.6-RELEASE______
+Feb 15th 05	yChat 0.7.5-RELEASE______
+Feb 14th 05	yChat 0.7.4.1-RELEASE____	Major bugfixes
+Feb 12th 05	yChat 0.7.4-RELEASE______
+Feb 10th 05	yChat 0.7.4-PRERELEASE___
+Dec 29th 04	yChat 0.7.3-RELEASE______
+Nov 09th 04	yChat 0.7.2-RELEASE______
+Nov 06th 04	yhttpd 0.7.1-RELEASE_____
+Nov 06th 04	yChat 0.7.1-RELEASE______
 Nov 01st 04	yhttpd 0.7-RELEASE_______	Initial release
-Oct 31st 04	yChat 0.7-RELEASE________	Cleanup, features 
-Jan 03rd 04	yChat 0.5.1-RELEASE______	Cleanup, bugfixes  
-Sep 15th 03	yChat 0.6-RELEASE________	Cleanup, features
-Sep 15th 03	yChat 0.5.0-RELEASE______	Features	
-Apr 26th 03	yChat 0.4-RELEASE________	Features	
-Mar 30th 03	yChat 0.3-RELEASE________	Features	
-Mar 24th 03	yChat 0.2-RELEASE________	Bugfixes	
+Oct 31st 04	yChat 0.7-RELEASE________
+Jan 03rd 04	yChat 0.5.1-RELEASE______
+Sep 15th 03	yChat 0.6-RELEASE________
+Sep 15th 03	yChat 0.5.0-RELEASE______
+Apr 26th 03	yChat 0.4-RELEASE________
+Mar 30th 03	yChat 0.3-RELEASE________
+Mar 24th 03	yChat 0.2-RELEASE________
 Mar 20th 03	yChat 0.1-RELEASE________	Initial release
  
diff --git a/TODO b/TODO
index 009aa00..6d4442e 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,8 @@
 - Must do's for next RELEASE -
-$ Add thread pool decreasing
+$ None specific
 
 - Might do's for next RELEASE -
+$ Add thread pool decreasing
 $ dir : public vector<string>
 $ Disable /help command for commands wich are not accessible for the
 $ specific user.
@@ -9,6 +10,10 @@ $ Flood protection
 $ Add /nick, /beam, /su
 $  Add / to whisper to the last person to whom the user has been whispered the last time.
 
+- Known bugs -
+$ The session manager sometimes does not free a session. The user object might hang.
+$ Using yChat via proxy sometimes causes a white chat stream.
+
 - To do in general for some later RELEASE -
 $ Use libevent
 $ Not found sites should get a 404 error site!
diff --git a/etc/ychat.conf b/etc/ychat.conf
index 3a9f788..786096b 100644
--- a/etc/ychat.conf
+++ b/etc/ychat.conf
@@ -1,4 +1,5 @@
-<?xml version="5.0" encoding="ISO-8859-1" standalone="yes" ?>
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes" ?>
+<config>
 <category name="chat">
     <option name="defaultop">
         <value>Snoop</value>
@@ -686,3 +687,4 @@
         </option>
     </category>
 </category>
+</config>
diff --git a/scripts/makeyhttpd.pl b/scripts/makeyhttpd.pl
index 6adcc96..7dd0345 100644
--- a/scripts/makeyhttpd.pl
+++ b/scripts/makeyhttpd.pl
@@ -40,6 +40,7 @@ my %substituate = (
   'yChat' => 'yhttpd',
   'YCHAT' => 'YHTTPD',
   'CHAT' => 'HTTPD',
+  'yhttpd.org' => 'yChat.org',
   '//>>' => ''
 );
 
@@ -156,7 +157,7 @@ sub remove_marked_lines {
 sub edit_yhttpd_conf
 {
   my @old = fopen("etc/yhttpd.conf");
-  my @new = shift @old;
+  my @new = @old[0..1];
 
   my $flag = 0;
   for (@old)
diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index 2e5893b..38c29c4 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -36,6 +36,7 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : name::name( s_
     cout << CFILEFA << endl;
     exit(1);
   }
+
   else
   {
     cout << CFILEOK << "..." << endl;
@@ -76,12 +77,18 @@ conf::parse_xml(TiXmlNode* p_node, vector<string>* p_vec)
   {
     //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl;
 
-    if ( strcmp(p_child->Value(),"category") == 0 )
+    if ( strcmp(p_child->Value(),"config") == 0 )
+    {
+      parse_xml(p_child, p_vec);
+    }
+
+    else if ( strcmp(p_child->Value(),"category") == 0 )
     {
       p_vec->push_back(p_child->ToElement()->Attribute("name"));
       parse_xml(p_child, p_vec);
       p_vec->pop_back();
     }
+
     else if ( strcmp(p_child->Value(),"option") == 0 )
     {
       string s_option_name = "";
diff --git a/src/glob.h b/src/glob.h
index 7d64126..60526fb 100755
--- a/src/glob.h
+++ b/src/glob.h
@@ -22,7 +22,7 @@
  Should yChat get compiled with database support? Currently MyS-
  QL only is a supported database. 
 */
-//#define DATABASE
+#define DATABASE
 
 #ifdef DATABASE
 #define USE_MYSQL 
diff --git a/src/msgs.h b/src/msgs.h
index 04cfa5c..7fb4a98 100755
--- a/src/msgs.h
+++ b/src/msgs.h
@@ -112,10 +112,10 @@
 #define XMLREAD "XML: Reading "
 #define XMLERR "XML Error: "
 #define XMLER1 "XML Error: Unable to load file "
-#define VERSION "0.7.9"
+#define VERSION "0.7.9.1"
 #define BRANCH "RELEASE"
-#define BUILDNR 3624
-#define UNAME "FreeBSD 5.3-RELEASE-p5 i386"
+#define BUILDNR 3632
+#define UNAME "FreeBSD 5.3-RELEASE-p6 i386"
 #define COMPOPT "Using built-in specs.; Configured with: FreeBSD/i386 system compiler; Thread model: posix; gcc version 3.4.2 [FreeBSD] 20040728; 3.4; g++"
 #define YCUSAGE "Usage: ./ychat {h|v}|{o confkey confvalue}\n"
 
@@ -127,6 +127,6 @@
 #define HEADER6 "Connection: keep-alive\r\n"
 #define HEADER7 "Content-Length: ";
 #define HEADER8 "Content-Type: ";
-#define HEADER9 "Allow: GET\n";
+#define HEADER9 "Allow: GET\r\n";
 
 #endif