myserver-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myserver-commit] [SCM] GNU MyServer branch, master, updated. 7f0c89b9f1


From: Giuseppe Scrivano
Subject: [myserver-commit] [SCM] GNU MyServer branch, master, updated. 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
Date: Thu, 16 Jul 2009 21:26:47 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  7f0c89b9f11c75439d20a0a36d6cb5cae34d9365 (commit)
       via  adcbc7097542096778e83efc13c9bc4107eb3fa1 (commit)
       via  50f1b53c6839600fca479a2eaa69532f57df9968 (commit)
       via  a5d9bd05cc02128377e7e0c5fadded2a049135b3 (commit)
      from  205cc0f5386bee92fb0e215287bdafd316549c90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 7f0c89b9f11c75439d20a0a36d6cb5cae34d9365
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jul 16 23:15:28 2009 +0200

    Last things for 0.9-rc1.

diff --git a/misc/wingen/NSIS installer script.nsi b/misc/wingen/NSIS installer 
script.nsi
index de5397d..84d196e 100644
--- a/misc/wingen/NSIS installer script.nsi     
+++ b/misc/wingen/NSIS installer script.nsi     
@@ -14,11 +14,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments"            
"www.gnu.org/softwar
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName"         "Free Software 
Foundation Inc."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"      "GNU MyServer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription"     "GNU MyServer 
webserver"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"         "0.9.0.3"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion"      "0.9.0.3"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"         "0.9.0.1"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion"      "0.9.0.1"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName"        ""
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks"    ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename"    
"MyServer-win32-0.9.0.exe"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename"    
"MyServer-win32-0.9-rc1.exe"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "PrivateBuild"       "1"
 ;VIAddVersionKey /LANG=${LANG_ENGLISH} "SpecialBuild"       "1"
 
@@ -127,61 +127,61 @@ InstallDirRegKey HKLM "Software\MyServer" ""
 
 
 ; Available Languages
-LicenseLangString MUILicense ${LANG_ENGLISH} "license.txt"                     
;DEFAULT LANGUAGE
-LicenseLangString MUILicense ${LANG_AFRIKAANS} "license.txt"
-LicenseLangString MUILicense ${LANG_ALBANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_ARABIC} "license.txt"
-LicenseLangString MUILicense ${LANG_BASQUE} "license.txt"
-LicenseLangString MUILicense ${LANG_BELARUSIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_BOSNIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_BRETON} "license.txt"
-LicenseLangString MUILicense ${LANG_BULGARIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_CROATIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_CZECH} "license.txt"
-LicenseLangString MUILicense ${LANG_DANISH} "license.txt"
-LicenseLangString MUILicense ${LANG_DUTCH} "license.txt"
-LicenseLangString MUILicense ${LANG_ESTONIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_FARSI} "license.txt"
-LicenseLangString MUILicense ${LANG_FINNISH} "license.txt"
-LicenseLangString MUILicense ${LANG_FRENCH} "license.txt"
-LicenseLangString MUILicense ${LANG_GALICIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_GERMAN} "license.txt"
-LicenseLangString MUILicense ${LANG_GREEK} "license.txt"
-LicenseLangString MUILicense ${LANG_HEBREW} "license.txt"
-LicenseLangString MUILicense ${LANG_HUNGARIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_ICELANDIC} "license.txt"
-LicenseLangString MUILicense ${LANG_INDONESIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_IRISH} "license.txt"
-LicenseLangString MUILicense ${LANG_ITALIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_JAPANESE} "license.txt"
-LicenseLangString MUILicense ${LANG_KOREAN} "license.txt"
-LicenseLangString MUILicense ${LANG_KURDISH} "license.txt"
-LicenseLangString MUILicense ${LANG_LATVIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_LITHUANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_LUXEMBOURGISH} "license.txt"
-LicenseLangString MUILicense ${LANG_MACEDONIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_MALAY} "license.txt"
-LicenseLangString MUILicense ${LANG_MONGOLIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_NORWEGIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_NORWEGIANNYNORSK} "license.txt"
-LicenseLangString MUILicense ${LANG_POLISH} "license.txt"
-LicenseLangString MUILicense ${LANG_PORTUGUESE} "license.txt"
-LicenseLangString MUILicense ${LANG_PORTUGUESEBR} "license.txt"
-LicenseLangString MUILicense ${LANG_ROMANIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_RUSSIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SERBIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SERBIANLATIN} "license.txt"
-LicenseLangString MUILicense ${LANG_SIMPCHINESE} "license.txt"
-LicenseLangString MUILicense ${LANG_SLOVAK} "license.txt"
-LicenseLangString MUILicense ${LANG_SLOVENIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_SPANISH} "license.txt"
-LicenseLangString MUILicense ${LANG_SWEDISH} "license.txt"
-LicenseLangString MUILicense ${LANG_THAI} "license.txt"
-LicenseLangString MUILicense ${LANG_TRADCHINESE} "license.txt"
-LicenseLangString MUILicense ${LANG_TURKISH} "license.txt"
-LicenseLangString MUILicense ${LANG_UKRAINIAN} "license.txt"
-LicenseLangString MUILicense ${LANG_UZBEK} "license.txt"
-LicenseLangString MUILicense ${LANG_WELSH} "license.txt"
+LicenseLangString MUILicense ${LANG_ENGLISH} "COPYING"                 
;DEFAULT LANGUAGE
+LicenseLangString MUILicense ${LANG_AFRIKAANS} "COPYING"
+LicenseLangString MUILicense ${LANG_ALBANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_ARABIC} "COPYING"
+LicenseLangString MUILicense ${LANG_BASQUE} "COPYING"
+LicenseLangString MUILicense ${LANG_BELARUSIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_BOSNIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_BRETON} "COPYING"
+LicenseLangString MUILicense ${LANG_BULGARIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_CROATIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_CZECH} "COPYING"
+LicenseLangString MUILicense ${LANG_DANISH} "COPYING"
+LicenseLangString MUILicense ${LANG_DUTCH} "COPYING"
+LicenseLangString MUILicense ${LANG_ESTONIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_FARSI} "COPYING"
+LicenseLangString MUILicense ${LANG_FINNISH} "COPYING"
+LicenseLangString MUILicense ${LANG_FRENCH} "COPYING"
+LicenseLangString MUILicense ${LANG_GALICIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_GERMAN} "COPYING"
+LicenseLangString MUILicense ${LANG_GREEK} "COPYING"
+LicenseLangString MUILicense ${LANG_HEBREW} "COPYING"
+LicenseLangString MUILicense ${LANG_HUNGARIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_ICELANDIC} "COPYING"
+LicenseLangString MUILicense ${LANG_INDONESIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_IRISH} "COPYING"
+LicenseLangString MUILicense ${LANG_ITALIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_JAPANESE} "COPYING"
+LicenseLangString MUILicense ${LANG_KOREAN} "COPYING"
+LicenseLangString MUILicense ${LANG_KURDISH} "COPYING"
+LicenseLangString MUILicense ${LANG_LATVIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_LITHUANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_LUXEMBOURGISH} "COPYING"
+LicenseLangString MUILicense ${LANG_MACEDONIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_MALAY} "COPYING"
+LicenseLangString MUILicense ${LANG_MONGOLIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_NORWEGIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_NORWEGIANNYNORSK} "COPYING"
+LicenseLangString MUILicense ${LANG_POLISH} "COPYING"
+LicenseLangString MUILicense ${LANG_PORTUGUESE} "COPYING"
+LicenseLangString MUILicense ${LANG_PORTUGUESEBR} "COPYING"
+LicenseLangString MUILicense ${LANG_ROMANIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_RUSSIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SERBIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SERBIANLATIN} "COPYING"
+LicenseLangString MUILicense ${LANG_SIMPCHINESE} "COPYING"
+LicenseLangString MUILicense ${LANG_SLOVAK} "COPYING"
+LicenseLangString MUILicense ${LANG_SLOVENIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_SPANISH} "COPYING"
+LicenseLangString MUILicense ${LANG_SWEDISH} "COPYING"
+LicenseLangString MUILicense ${LANG_THAI} "COPYING"
+LicenseLangString MUILicense ${LANG_TRADCHINESE} "COPYING"
+LicenseLangString MUILicense ${LANG_TURKISH} "COPYING"
+LicenseLangString MUILicense ${LANG_UKRAINIAN} "COPYING"
+LicenseLangString MUILicense ${LANG_UZBEK} "COPYING"
+LicenseLangString MUILicense ${LANG_WELSH} "COPYING"
 
 ; reserves the files: speeds up installer
 !insertmacro MUI_RESERVEFILE_LANGDLL
@@ -191,18 +191,17 @@ Section "MyServer core" SecCore
   SetOutPath $INSTDIR
   WriteUninstaller "uninstall.exe"
   File "myserver.exe"
-  File  "*.dll"
-  File "MIMEtypes.default.windows.xml"
-  File "myserver.default.windows.xml"
-  File "virtualhosts.default.windows.xml"
-  File "../README"
-  File "../COPYING"
+  File "MIMEtypes.xml"
+  File "myserver.xml"
+  File "virtualhosts.xml"
+  File "README"
+  File "COPYING"
   CreateDirectory "$INSTDIR\logs"
   SetOutPath $INSTDIR\web
   File "web\*.html"
   File "web\*.png"
   SetOutPath $INSTDIR\system
-  File "system\security"
+  File "system\.security.xml"
   SetOutPath $INSTDIR\system\css
   File "system\css\*.css"
   SetOutPath $INSTDIR\system\errors
@@ -244,21 +243,21 @@ SectionEnd
 Section "Web examples" SecWebEx
   SetOutPath "$INSTDIR\web\cgi-bin"
   File "web\cgi-bin\*.html"
-  File "web\cgi-bin\*.mscgi"
+  File /nonfatal "web\cgi-bin\*.mscgi"
 ; COPY SOURCE CODE
 ;  SetOutPath $INSTDIR\web\cgi-src\math_sum
 ;  File "web\cgi-src\math_sum\*.*"
 ;  SetOutPath "$INSTDIR\web\cgi-src\post"
 ;  File "web\cgi-src\post\*.*"
   SetOutPath "$INSTDIR\web\downloads"
-  File "web\downloads\*.php"
-  File "web\downloads\*.txt"
-  File "web\downloads\*.sh"
+  File /nonfatal "web\downloads\*.php"
+  File /nonfatal "web\downloads\*.txt"
+  File /nonfatal "web\downloads\*.sh"
 SectionEnd
 
 Section "Documentation" SecDocumentation
   SetOutPath "$INSTDIR\web\documentation"
-  File "..\documentation\myserver.html\*"
+  File /nonfatal "..\documentation\myserver.html\*"
 SectionEnd
 
 Section "Install other languages" SecLanguages
@@ -328,14 +327,13 @@ Section "Uninstall"
   Delete "$INSTDIR\languages\*.*"
   Delete "$INSTDIR\logs\*.*"
   Delete "$INSTDIR\*.exe"
-  Delete "$INSTDIR\*.dll"
   Delete "$INSTDIR\*.ico"
   Delete "$INSTDIR\*.txt"  
   Delete "$INSTDIR\documentation\*.*"
   Delete "$INSTDIR\documentation\images\*.*"
   RMDir "$INSTDIR\documentation"
   RMDir "$INSTDIR\images"
-; REMOVE ALL THE WEB AND CONFIGURATION FILES
+;;;;;;;;;;; REMOVE ALL THE WEB AND CONFIGURATION FILES
 ;  Delete "$INSTDIR\web\*.*"
 ;  Delete "$INSTDIR\web\cgi-bin\*.*"
 ;  Delete "$INSTDIR\web\cgi-src\math_sum\*.*"
@@ -367,11 +365,9 @@ DeleteRegKey HKLM 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\MyServer"
 
 SectionEnd
 
-
 ; Uninstaller Functions
 
 ;Function un.onInit
 ;  select language during uninstall
 ;  !insertmacro MUI_UNGETLANGUAGE
-  
 ;FunctionEnd
diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 93af3d9..afc027e 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = languages logs system web certificates plugins
 
-EXTRA_DIST = myserver-daemon myserver.ico license.txt 
MIMEtypes.xml.unix.default \
-myserver.xml.unix.default readme.txt virtualhosts.xml.unix.default
+EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
+                                                virtualhosts.default.xml
 
 configdir = $(root_prefix)/etc/myserver
 
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 467891f..81a6fb7 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -1,5 +1,5 @@
 lib_LIBRARIES = libbase.a
 libbase_a_SOURCES = utility.cpp
-SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map 
home_dir md5 mem_buff multicast pipe process regex safetime socket socket_pair 
ssl string sync thread xml unix_socket
+SUBDIRS = base64 bitvec dynamic_lib file files_cache find_data hash_map 
home_dir md5 mem_buff multicast pipe process regex safetime slab socket 
socket_pair ssl string sync thread xml unix_socket
 INCLUDES = $(all_includes)
 



commit adcbc7097542096778e83efc13c9bc4107eb3fa1
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jul 16 21:51:25 2009 +0200

    Fixed some possible memory leaks.

diff --git a/myserver/src/plugin/plugins_manager.cpp 
b/myserver/src/plugin/plugins_manager.cpp
index e00fef1..7e238bb 100755
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -24,6 +24,15 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <list>
 #include <string>
 
+extern "C"
+{
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+}
+
 using namespace std;
 
 /*!
@@ -98,17 +107,15 @@ PluginsManager::loadOptions (Server *server)
       if (node->getAttr (enabledKey))
         enabled = stringcmpi (*node->getAttr (enabledKey), "YES") == 0;
 
-      if (!plugin.length ())
+      if (plugin.length ())
+        addPluginInfo (plugin, new PluginInfo (plugin, enabled, global));
+      else
         {
           string error;
           error.assign ("Invalid plugin name in PLUGIN block.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_WARNING);
           ret = -1;
         }
-      else
-        {
-          addPluginInfo (plugin, new PluginInfo (plugin, enabled, global));
-        }
     }
 
   return ret;
@@ -284,9 +291,12 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
 
   if (xmlHasProp (nodes->nodeTab[0], (const xmlChar*) "min-version"))
     {
-      char* mSMinVersion = (char*) xmlGetProp (nodes->nodeTab[0], (const 
xmlChar*) "min-version");
-      pinfo->setMyServerMinVersion (PluginInfo::convertVersion (new string 
(mSMinVersion)));
-      xmlFree (mSMinVersion);
+      xmlChar *minVersion = xmlGetProp (nodes->nodeTab[0],
+                                        (const xmlChar*) "min-version");
+
+      string sMinVer ((char*)minVersion);
+      pinfo->setMyServerMinVersion (PluginInfo::convertVersion (&sMinVer));
+      xmlMemFree ((void*)minVersion);
     }
   else
     {
@@ -302,9 +312,12 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
 
   if (xmlHasProp (nodes->nodeTab[0], (const xmlChar*) "max-version"))
     {
-      char* mSMaxVersion = (char*) xmlGetProp (nodes->nodeTab[0], (const 
xmlChar*) "max-version");
-      pinfo->setMyServerMaxVersion (PluginInfo::convertVersion (new string 
(mSMaxVersion)));
-      xmlFree (mSMaxVersion);
+      xmlChar* maxVersion = xmlGetProp (nodes->nodeTab[0],
+                                        (const xmlChar*) "max-version");
+
+      string sMaxVer ((char*)maxVersion);
+      pinfo->setMyServerMaxVersion (PluginInfo::convertVersion (&sMaxVer));
+      xmlMemFree ((void*)maxVersion);
     }
   else
     {
@@ -313,16 +326,16 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   xpathRes = xml.evaluateXpath ("/PLUGIN/NAME/text()");
   nodes = xpathRes->getNodeSet ();
   size = (nodes) ? nodes->nodeNr : 0;
 
-
   if (size != 1)
     {
       string error;
@@ -330,6 +343,7 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
@@ -337,16 +351,17 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
 
 
   if (strcmp (name.c_str (), cname))
-    return NULL;
+    {
+      delete xpathRes;
+      return NULL;
+    }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   xpathRes = xml.evaluateXpath ("/PLUGIN/VERSION/text()");
   nodes = xpathRes->getNodeSet ();
   size = (nodes) ? nodes->nodeNr : 0;
 
-
-
   if (size != 1)
     {
       string error;
@@ -354,11 +369,13 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
 
   int version = PluginInfo::convertVersion (new string ((char*) 
nodes->nodeTab[0]->content));
+
   if (version!=-1)
     pinfo->setVersion (version);
   else
@@ -368,6 +385,7 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
       error.append (name);
       error.append (", bad plugin.xml format.");
       server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+      delete xpathRes;
       return NULL;
     }
 
@@ -384,7 +402,8 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
 
       string nameDep (depends);
 
-      if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") || 
!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
+      if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") ||
+          !xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
         {
           string error;
           error.append ("Unable to load plugin ");
@@ -394,24 +413,27 @@ PluginsManager::loadInfo (Server* server, string& name, 
string& path)
           return NULL;
         }
 
-      int minVersion = PluginInfo::convertVersion (new string ((char*) 
xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "min-version")));
+      int minVersion = PluginInfo::convertVersion (new string ((char*) 
xmlGetProp (nodes->nodeTab[i],
+                                                                               
    (const xmlChar*) "min-version")));
 
-      int maxVersion = PluginInfo::convertVersion (new string ((char*) 
xmlGetProp (nodes->nodeTab[i], (const xmlChar*) "max-version")));
+      int maxVersion = PluginInfo::convertVersion (new string ((char*) 
xmlGetProp (nodes->nodeTab[i],
+                                                                               
    (const xmlChar*) "max-version")));
 
       if (minVersion == -1 || maxVersion == -1)
-                {
+        {
           string error;
           error.append ("Unable to load plugin ");
           error.append (name);
           error.append (", bad plugin.xml format.");
           server->logWriteln (error.c_str (), MYSERVER_LOG_MSG_ERROR);
+          delete xpathRes;
           return NULL;
         }
 
       pinfo->addDependence (nameDep, minVersion, maxVersion);
     }
 
-  xmlFree (xpathRes);
+  delete xpathRes;
 
   return pinfo;
 }



commit 50f1b53c6839600fca479a2eaa69532f57df9968
Merge: a5d9bd0 205cc0f
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jul 16 21:09:57 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver




commit a5d9bd05cc02128377e7e0c5fadded2a049135b3
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jul 16 20:54:39 2009 +0200

    Version bump.

diff --git a/myserver/version b/myserver/version
index 984acb4..1a7ab56 100644
--- a/myserver/version
+++ b/myserver/version
@@ -1 +1 @@
-0.9.0-rc2
\ No newline at end of file
+0.9.0-rc1
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 misc/wingen/NSIS installer script.nsi   |  144 +++++++++++++++----------------
 myserver/binaries/Makefile.am           |    4 +-
 myserver/src/base/Makefile.am           |    2 +-
 myserver/src/plugin/plugins_manager.cpp |   66 ++++++++++-----
 myserver/version                        |    2 +-
 5 files changed, 118 insertions(+), 100 deletions(-)


hooks/post-receive
-- 
GNU MyServer




reply via email to

[Prev in Thread] Current Thread [Next in Thread]