multiline comment fix for WODParser.m

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1328 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 4e9fb0b2833ae3402b4a642d66460d58e5a37e9e..63b71db8d28d6d4a01672190d2811a9a6c03e265 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-25  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Templates/WODParser.m: fixed an infinite loop bug during comment
+         scanning that occured when a multiline comment contained a '*'
+         (v4.5.241)
+
 2006-07-05  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.240

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
index d2be7ed7682f74c1252e435f736b429014272e40..783d599a3d5b603a1fb55e97203427413c6309c4 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
@@ -42,53 +42,6 @@
                ADFE62B006E25BFE006628C4 /* NGExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADFE62AF06E25BFB006628C4 /* NGExtensions.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               ADD65B6806DA32D6007161CA /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                                       "DEBUG=1",
-                               );
-                       };
-                       name = Development;
-               };
-               ADD65B6906DA32D6007161CA /* Wrapper */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEPLOYMENT_LOCATION = NO;
-                               DEPLOYMENT_POSTPROCESSING = YES;
-                               DSTROOT = /;
-                               DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
-                               FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                               );
-                               SKIP_INSTALL = YES;
-                               SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build";
-                               UNSTRIPPED_PRODUCT = NO;
-                               ZERO_LINK = NO;
-                       };
-                       name = Wrapper;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
                AD915D4906E29FC5004720C2 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -408,55 +361,11 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
-                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               FRAMEWORK_VERSION = A;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = common.h;
-                               GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               GCC_WARN_UNKNOWN_PRAGMAS = NO;
-                               INFOPLIST_FILE = "NGHttp-Info.plist";
-                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       "-seg1addr",
-                                       0xC3400000,
-                                       "-headerpad_max_install_names",
-                               );
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = NGHttp;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = "-Wmost";
-                       };
                        dependencies = (
                        );
                        name = NGHttp;
                        productName = NGHttp;
                        productReference = ADD65D5806DA372D007161CA /* NGHttp.framework */;
-                       productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>NGHttp</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.OpenGroupware.SOPE.NGHttp</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>FMWK</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-</dict>
-</plist>
-";
                        productType = "com.apple.product-type.framework";
                };
 /* End PBXNativeTarget section */
@@ -465,12 +374,6 @@
                ADD65B6A06DA32D6007161CA /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = ADA078B5085738AB00993825 /* Build configuration list for PBXProject "NGHttp" */;
-                       buildSettings = {
-                       };
-                       buildStyles = (
-                               ADD65B6806DA32D6007161CA /* Development */,
-                               ADD65B6906DA32D6007161CA /* Wrapper */,
-                       );
                        hasScannedForEncodings = 0;
                        mainGroup = ADD65B6606DA32D6007161CA;
                        productRefGroup = ADD65D5906DA372D007161CA /* Products */;
@@ -596,7 +499,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -637,7 +540,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -680,7 +583,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index c68709d2a9a0abee4566f0be1ff0ecbf3a8ecec0..d3ef38d77bfb114abbdbac9b92bf41e20b6cdbd1 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -12,18 +12,6 @@
                        buildConfigurationList = ADA078F3085738C500993825 /* Build configuration list for PBXAggregateTarget "all" */;
                        buildPhases = (
                        );
-                       buildSettings = {
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = all;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                                AD20BAE60737DB8B002A6594 /* PBXTargetDependency */,
                        );
@@ -35,18 +23,6 @@
                        buildConfigurationList = ADA078F7085738C500993825 /* Build configuration list for PBXAggregateTarget "SoProducts" */;
                        buildPhases = (
                        );
-                       buildSettings = {
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = Products;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                                ADE807390789F90C00633840 /* PBXTargetDependency */,
                        );
@@ -59,18 +35,6 @@
                        buildPhases = (
                                AD20BB060737E529002A6594 /* ShellScript */,
                        );
-                       buildSettings = {
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = CleanProducts;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                        );
                        name = CleanSoProducts;
@@ -82,18 +46,6 @@
                        buildPhases = (
                                AD20BB0F0737E5AC002A6594 /* ShellScript */,
                        );
-                       buildSettings = {
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = CopySoProducts;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                        );
                        name = CopySoProducts;
@@ -480,53 +432,6 @@
                ADFE736B06E287FA006628C4 /* SoObjects.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADFE736A06E287F5006628C4 /* SoObjects.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               ADD65B6806DA32D6007161CA /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                                       "DEBUG=1",
-                               );
-                       };
-                       name = Development;
-               };
-               ADD65B6906DA32D6007161CA /* Wrapper */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               DEPLOYMENT_LOCATION = NO;
-                               DEPLOYMENT_POSTPROCESSING = YES;
-                               DSTROOT = /;
-                               DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
-                               FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_OPTIMIZATION_LEVEL = 3;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "APPLE_RUNTIME=1",
-                                       "NeXT_Foundation_LIBRARY=1",
-                                       "COCOA_Foundation_LIBRARY=1",
-                                       "NeXT_RUNTIME=1",
-                                       "COMPILE_AS_FRAMEWORK=1",
-                               );
-                               SKIP_INSTALL = YES;
-                               SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
-                               TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build";
-                               UNSTRIPPED_PRODUCT = NO;
-                               ZERO_LINK = NO;
-                       };
-                       name = Wrapper;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
                AD20BAE50737DB8B002A6594 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -1982,60 +1887,11 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
-                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               FRAMEWORK_VERSION = A;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = common.h;
-                               GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               GCC_WARN_UNKNOWN_PRAGMAS = NO;
-                               HEADER_SEARCH_PATHS = ..;
-                               INFOPLIST_FILE = "NGObjWeb-Info.plist";
-                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               OTHER_CFLAGS = (
-                                       "-DSOPE_MAJOR_VERSION=4",
-                                       "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=233",
-                               );
-                               OTHER_LDFLAGS = (
-                                       "-seg1addr",
-                                       0xC4900000,
-                                       "-headerpad_max_install_names",
-                               );
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = NGObjWeb;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = "-Wmost";
-                       };
                        dependencies = (
                        );
                        name = NGObjWeb;
                        productName = NGObjWeb;
                        productReference = ADD65D5806DA372D007161CA /* NGObjWeb.framework */;
-                       productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>NGObjWeb</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.OpenGroupware.SOPE.NGObjWeb</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>FMWK</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-</dict>
-</plist>
-";
                        productType = "com.apple.product-type.framework";
                };
                ADFE6FFD06E2765E006628C4 /* SoCore (SXP) */ = {
@@ -2049,54 +1905,12 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               GCC_PRECOMPILE_PREFIX_HEADER = NO;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               GCC_WARN_UNKNOWN_PRAGMAS = NO;
-                               INFOPLIST_FILE = "SoObjects/SoCore-SXP-Info.plist";
-                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/SoProducts";
-                               OTHER_CFLAGS = (
-                                       "-I..",
-                                       "-DAPPLE_RUNTIME=1",
-                                       "-DNeXT_RUNTIME=1",
-                                       "-DCOCOA_Foundation_LIBRARY=1",
-                                       "-DCOMPILE_AS_FRAMEWORK=1",
-                                       "-DNeXT_Foundation_LIBRARY=1",
-                               );
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = SoCore;
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = "-Wmost";
-                               WRAPPER_EXTENSION = sxp;
-                       };
                        dependencies = (
                                ADFE701206E2787E006628C4 /* PBXTargetDependency */,
                        );
                        name = "SoCore (SXP)";
                        productName = "SoCore (SXP)";
                        productReference = ADFE6FFE06E2765E006628C4 /* SoCore.sxp */;
-                       productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>SoCore (SXP)</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.yourcompany.SoCore__SXP_</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0</string>
-</dict>
-</plist>
-";
                        productType = "com.apple.product-type.bundle";
                };
 /* End PBXNativeTarget section */
@@ -2105,12 +1919,6 @@
                ADD65B6A06DA32D6007161CA /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = ADA07908085738C500993825 /* Build configuration list for PBXProject "NGObjWeb" */;
-                       buildSettings = {
-                       };
-                       buildStyles = (
-                               ADD65B6806DA32D6007161CA /* Development */,
-                               ADD65B6906DA32D6007161CA /* Wrapper */,
-                       );
                        hasScannedForEncodings = 0;
                        mainGroup = ADD65B6606DA32D6007161CA;
                        productRefGroup = ADD65D5906DA372D007161CA /* Products */;
@@ -2506,7 +2314,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2530,7 +2338,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=233",
+                                       "-DSOPE_SUBMINOR_VERSION=241",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2552,7 +2360,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2577,7 +2385,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=233",
+                                       "-DSOPE_SUBMINOR_VERSION=241",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2600,7 +2408,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2614,7 +2422,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=233",
+                                       "-DSOPE_SUBMINOR_VERSION=241",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
index d2e2c07f4cbbcbae7ed5739cd53fe1e1c416d89a..335e366dd7fc1802411d9b5503046f25056596e7 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
@@ -305,7 +305,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -404,7 +404,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -444,7 +444,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -486,7 +486,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/Templates/WODParser.m b/sope-appserver/NGObjWeb/Templates/WODParser.m
index 7e318cf9ec78c2c9dd92e01236ce9004efc9a8de..ab0f93c60c111b21bcc599e022ef91a01151a88d 100644 (file)
--- a/sope-appserver/NGObjWeb/Templates/WODParser.m
+++ b/sope-appserver/NGObjWeb/Templates/WODParser.m
@@ -349,6 +349,9 @@ static BOOL _skipComments(const unichar *_buffer,
                 lookAgain = YES;
                 break; // leave loop
               }
+              else {
+                pos += 1; // skip '*'
+              }
             }
           }
         }

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 10b497847a590039577056b5b9a054cb1fc6f156..9dd486dd45ad68f0a5182df3dec222997c361741 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=239
+SUBMINOR_VERSION:=241
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
index 119d942f2386feaf0aabe96f20fdf3c5b4b272ef..05dc49b6cd8b74cf3ba1be3e518ae27dbbab5577 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -332,7 +332,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -372,7 +372,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -414,7 +414,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.233;
+                               DYLIB_CURRENT_VERSION = 4.5.241;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;