From 988dee22699a1f4cbd5438876da49ac285a01843 Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 28 Sep 2005 22:41:38 +0000 Subject: [PATCH] bugfix, bumped dyld versions git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1142 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 6 +++++ .../DynamicElements/_WOComplexHyperlink.m | 10 ++++---- .../NGHttp/NGHttp.xcodeproj/project.pbxproj | 8 +++---- .../NGObjWeb.xcodeproj/project.pbxproj | 24 +++++++++---------- .../SoObjects.xcodeproj/project.pbxproj | 8 +++---- sope-appserver/NGObjWeb/Version | 2 +- .../WebDAV/WebDAV.xcodeproj/project.pbxproj | 8 +++---- 7 files changed, 36 insertions(+), 30 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index de2a8e7d..df658e8b 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,9 @@ +2005-09-29 Marcus Mueller + + * DynamicElements/_WOComplexHyperlink.m: changed + -shouldRewriteURLString:inContext: to only rewrite url strings which + either do not bear a scheme or have an `http' scheme (v4.5.203) + 2005-09-27 Helge Hess * DynamicElements/WOPopUpButton.m: fixed a bug in the 'selection' which diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m index 5da69b34..4fc7dda5 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m +++ b/sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m @@ -370,11 +370,11 @@ static BOOL debugStaticLinks = NO; - (BOOL)shouldRewriteURLString:(NSString *)_s inContext:(WOContext *)_ctx { // TODO: we need a binding to disable rewriting! - if ([_s hasPrefix:@"mailto:"]) - return NO; - if ([_s hasPrefix:@"javascript:"]) - return NO; - return YES; + NSRange r; + + r = [_s rangeOfString:@":"]; + if (!r.length) return YES; + return [[_s substringToIndex:r.location] isEqualToString:@"http"]; } - (BOOL)_appendHrefToResponse:(WOResponse *)_r inContext:(WOContext *)_ctx { diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj index bf43ab30..87cb7ea8 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj @@ -410,7 +410,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -596,7 +596,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -637,7 +637,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -680,7 +680,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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 6334e456..da02f5c1 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj @@ -1970,7 +1970,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1984,7 +1984,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=201", + "-DSOPE_SUBMINOR_VERSION=203", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2107,16 +2107,16 @@ ProjectRef = ADFE63E206E2656F006628C4 /* NGHttp.xcodeproj */; }, { - ProductGroup = ADFE6C9806E27071006628C4 /* Products */; - ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */; + ProductGroup = ADFE63E806E265AE006628C4 /* Products */; + ProjectRef = ADFE63E606E265AB006628C4 /* sope-core.xcodeproj */; }, { ProductGroup = ADFE736806E287E6006628C4 /* Products */; ProjectRef = ADFE736706E287E6006628C4 /* SoObjects.xcodeproj */; }, { - ProductGroup = ADFE63E806E265AE006628C4 /* Products */; - ProjectRef = ADFE63E606E265AB006628C4 /* sope-core.xcodeproj */; + ProductGroup = ADFE6C9806E27071006628C4 /* Products */; + ProjectRef = ADFE6C9706E27071006628C4 /* WebDAV.xcodeproj */; }, ); targets = ( @@ -2490,7 +2490,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -2514,7 +2514,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=201", + "-DSOPE_SUBMINOR_VERSION=203", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2536,7 +2536,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -2561,7 +2561,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=201", + "-DSOPE_SUBMINOR_VERSION=203", ); OTHER_LDFLAGS = ( "-seg1addr", @@ -2584,7 +2584,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2598,7 +2598,7 @@ OTHER_CFLAGS = ( "-DSOPE_MAJOR_VERSION=4", "-DSOPE_MINOR_VERSION=5", - "-DSOPE_SUBMINOR_VERSION=201", + "-DSOPE_SUBMINOR_VERSION=203", ); OTHER_LDFLAGS = ( "-seg1addr", diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj index 0a17c951..0b19d78b 100644 --- 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index e7507ced..8f2506ec 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=202 +SUBMINOR_VERSION:=203 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj index 4bb4bf23..0eae1b60 100644 --- 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; 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.201; + DYLIB_CURRENT_VERSION = 4.5.203; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; -- 2.39.5