Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7c4663de14edaff53367a32f5670ecb711f5e8c4
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7c4663de14edaff53367a32f5670ecb711f5e8c4
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7c4663de14edaff53367a32f5670ecb711f5e8c4
The branch, chris/amissl has been updated
via 7c4663de14edaff53367a32f5670ecb711f5e8c4 (commit)
via 806ac45d8c46a4ce5968675f23363206d6a736a8 (commit)
via 1a274192a7905d9a7366388ac67018bb67edf7e9 (commit)
via 3a8484c0b706cf439eb91545774734a4a755bb7c (commit)
via 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (commit)
via bd0a1533a52f5049680d67006dad6d9477b2a4be (commit)
via 22b1484300c727aacd0f0e410810d666df5c027d (commit)
via d0a9fc3e35113e8734d10338856a43599f98d50c (commit)
via 5d69dd9ddff1f39d8d8320df662fb881d8775649 (commit)
via 7d402ebc460ec5a11eab526cc52b4d6430496df3 (commit)
from 155c0c568f56012b624ae7000200e6f2d270ce50 (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 -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7c4663de14edaff53367a32f5670ecb711f5e8c4
commit 7c4663de14edaff53367a32f5670ecb711f5e8c4
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add new netinclude path to the includes if building against AmiSSL/direct
bsdsocket.library
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 7c4d16e..4aa09b6 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=806ac45d8c46a4ce5968675f23363206d6a736a8
commit 806ac45d8c46a4ce5968675f23363206d6a736a8
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add some extra comment about AmiSSL
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 17e097d..2d5cec7 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -8,6 +8,7 @@ NETSURF_USE_LIBICONV_PLUG := NO
# Use AmiSSL for secure connections.
# Either this or NETSURF_USE_OPENSSL should be specified, not both.
+# libcurl must have been built against the same library.
# Valid options: YES, NO
NETSURF_USE_AMISSL := NO
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1a274192a7905d9a7366388ac67018bb67edf7e9
commit 1a274192a7905d9a7366388ac67018bb67edf7e9
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Revert "try different debug option"
This reverts commit bd0a1533a52f5049680d67006dad6d9477b2a4be.
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 5e93012..17e097d 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -33,14 +33,11 @@ NETSURF_USE_NSSVG := YES
NETSURF_FS_BACKING_STORE := YES
# Optimisation levels
-CFLAGS += -fomit-frame-pointer
+CFLAGS += -fomit-frame-pointer -gstabs
# Target-specific
ifeq ($(SUBTARGET),os3)
NETSURF_USE_OPENSSL := NO
NETSURF_USE_AMISSL := YES
- CFLAGS += -ggdb
-else
- CFLAGS += -gstabs
endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3a8484c0b706cf439eb91545774734a4a755bb7c
commit 3a8484c0b706cf439eb91545774734a4a755bb7c
Merge: bd0a153 7c9066b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into
chris/amissl
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bd0a1533a52f5049680d67006dad6d9477b2a4be
commit bd0a1533a52f5049680d67006dad6d9477b2a4be
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
try different debug option
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 17e097d..5e93012 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -33,11 +33,14 @@ NETSURF_USE_NSSVG := YES
NETSURF_FS_BACKING_STORE := YES
# Optimisation levels
-CFLAGS += -fomit-frame-pointer -gstabs
+CFLAGS += -fomit-frame-pointer
# Target-specific
ifeq ($(SUBTARGET),os3)
NETSURF_USE_OPENSSL := NO
NETSURF_USE_AMISSL := YES
+ CFLAGS += -ggdb
+else
+ CFLAGS += -gstabs
endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=22b1484300c727aacd0f0e410810d666df5c027d
commit 22b1484300c727aacd0f0e410810d666df5c027d
Merge: 5d69dd9 d0a9fc3
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into
chris/amissl
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5d69dd9ddff1f39d8d8320df662fb881d8775649
commit 5d69dd9ddff1f39d8d8320df662fb881d8775649
Merge: 155c0c5 7d402eb
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into
chris/amissl
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 4 ++--
frontends/amiga/Makefile.defaults | 1 +
frontends/amiga/gui.c | 16 +---------------
frontends/amiga/libs.c | 10 +++++++---
frontends/amiga/schedule.c | 10 +++++++++-
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 850c941..4aa09b6 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
@@ -99,5 +99,5 @@ netsurf.lha: $(EXETARGET)
$(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
- lha a netsurf.lha NetSurf NetSurf.info AutoInstall
+ lha ao6 netsurf.lha NetSurf NetSurf.info AutoInstall
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 17e097d..2d5cec7 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -8,6 +8,7 @@ NETSURF_USE_LIBICONV_PLUG := NO
# Use AmiSSL for secure connections.
# Either this or NETSURF_USE_OPENSSL should be specified, not both.
+# libcurl must have been built against the same library.
# Valid options: YES, NO
NETSURF_USE_AMISSL := NO
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index cc4397e..2c84d4d 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -787,21 +787,7 @@ static nsurl *gui_get_resource_url(const char *path)
nsurl *url = NULL;
if(ami_locate_resource(buf, path) == false)
- {
- if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm",
SLEN(".htm")) == 0) ||
- (strncmp(path + strlen(path) - SLEN(".html"), ".html",
SLEN(".html")) == 0))
- {
- /* Try with RISC OS HTML filetype, might work */
- strcpy(path2, path);
- strcat(path2, ",faf");
-
- if(ami_locate_resource(buf, path2) == false)
- {
- return NULL;
- }
- }
- else return NULL;
- }
+ return NULL;
netsurf_path_to_nsurl(buf, &url);
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index cbef3c2..7de768b 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -113,7 +113,9 @@
#define AMINS_CLASS_CLOSE(PREFIX) \
if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \
- if(PREFIX##Base) CloseClass(PREFIX##Base);
+ if(PREFIX##Base) CloseClass(PREFIX##Base); \
+ I##PREFIX = NULL; \
+ PREFIX##Base = NULL;
#define AMINS_CLASS_STRUCT(PREFIX) \
struct ClassLibrary *PREFIX##Base = NULL; \
@@ -136,7 +138,8 @@
}
#define AMINS_LIB_CLOSE(PREFIX) \
- if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base);
+ if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \
+ PREFIX##Base = NULL;
#define AMINS_LIB_STRUCT(PREFIX) \
struct PREFIX##Base *PREFIX##Base = NULL;
@@ -156,7 +159,8 @@
}
#define AMINS_CLASS_CLOSE(PREFIX) \
- if(PREFIX##Base) CloseLibrary(PREFIX##Base);
+ if(PREFIX##Base) CloseLibrary(PREFIX##Base); \
+ PREFIX##Base = NULL;
#define AMINS_CLASS_STRUCT(PREFIX) \
struct Library *PREFIX##Base = NULL; \
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index 2d2da38..ee4e34a 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -170,7 +170,11 @@ static nserror schedule_remove(void (*callback)(void *p),
void *p, bool abort)
if(nscb != NULL) {
if(abort == true) ami_schedule_remove_timer_event(nscb);
+#ifdef __amigaos4__
FreeSysObject(ASOT_IOREQUEST, nscb);
+#else
+ FreeVec(nscb);
+#endif
pblHeapConstruct(schedule_list);
}
@@ -190,7 +194,11 @@ static void schedule_remove_all(void)
{
ami_schedule_remove_timer_event(nscb);
pblIteratorRemove(iterator);
+#ifdef __amigaos4__
FreeSysObject(ASOT_IOREQUEST, nscb);
+#else
+ FreeVec(nscb);
+#endif
};
pblIteratorFree(iterator);
@@ -337,7 +345,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void
*p)
TAG_DONE);
#else
if(schedule_msgport == NULL) return NSERROR_NOMEM;
- nscb = (struct nscallback *)CreateIORequest(schedule_msgport,
sizeof(struct nscallback));
+ nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR);
*nscb = *tioreq;
#endif
if(!nscb) return NSERROR_NOMEM;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
