netsurf-website: branch master updated. 346b24a7a2de6e453dd484548e6c92cd20dad534
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/346b24a7a2de6...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/346b24a7a2de6e4...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/346b24a7a2de6e453...
The branch, master has been updated
via 346b24a7a2de6e453dd484548e6c92cd20dad534 (commit)
from a43162d86e5a3e9b99385cf00ba98f533fee0973 (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-website.git/commit/?id=346b24a7a2d...
commit 346b24a7a2de6e453dd484548e6c92cd20dad534
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add details about project idea.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 85f3d02..c3fd353 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -59,6 +59,7 @@
<dd>
<ul>
<li>Join our IRC channel <code>#netsurf</code> on <a href="http://freenode.net/">Freenode</a> and introduce yourself. Also, subscribe to the <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</li>
+<li>Ideally students will have a dialogue with us about what they intend to do, before they make their application.</li>
<li>Get up to speed with <a href="http://wiki.netsurf-browser.org/Documentation/GettingCoding">Git</a>, as we use this for source control, and get the NetSurf <a href="http://www.netsurf-browser.org/documentation/develop#SourceControl">source code</a>.</li>
<li><a href="http://www.netsurf-browser.org/documentation/develop#Compiling">Build NetSurf</a> and enjoy using it. (Ask on IRC if you need help.)</li>
<li>Get familiarised with the source code – read the <a href="http://source.netsurf-browser.org/netsurf.git/tree/Docs">code documentation</a>.</li>
@@ -68,11 +69,11 @@
<dt>When applying for a project<dt>
<dd>
<ul>
+<li>Include your IRC nick in your application, so that we recognise you. <strong>We strongly recommend that you communicate with us on <code>#netsurf</code> before submitting an application.</strong></li>
<li>Tell us about yourself, your experience, and why you want to work with us.</li>
<li>Describe the project you want to do, and how you plan to go about doing it. <strong>Do not simply copy the project description from the ideas page.</strong></li>
<li>Create a set of project milestones (ranging from a couple to maximum 10) with expected completion dates. This will be useful for you as guidance and for us to set our expectations right.</li>
<li>Describe how you will test your contributions.</li>
-<li>Include your IRC nick in your application if you've spoken with us on <code>#netsurf</code>, so that we recognise you. <strong>We strongly recommend that you communicate with us before submitting an application.</strong></li>
<li>We expect GSoC to be mostly equivalent to a full-time job. Therefore, please tell us if you have any other demands on your time.</li>
</ul>
<dd>
@@ -99,26 +100,46 @@
</ul>
<h3>Project Outline</h3>
<h4>Phase 1</h4>
-<ul>
-<li>
-<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_button_eleme...">html_button_element.c</a> have implementations, while most like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_anchor_eleme...">html_anchor_element.c</a> do not.</p>
+<dl>
+<dt>LibDOM: Implement missing specialisations of HTMLElement</dt>
+<dd>
+<p>HTMLElement is the base class for representing HTML elements in the DOM. It contains the common data which applies to all HTML elements. Most elements, however, contain additional data or have specialised data processing requirements (for example, a Form element has an action attribute). These elements are represented in the DOM by specialised subclasses of HTMLElement.</p>
+<p>In the LibDOM implementation, many of these specialised subclasses have not been implemented. This means that many elements are still represented by the base HTMLElement class and the specialised data and behaviours are not available.</p>
+<p>The task in this phase, then, is to identify the missing/unimplemented HTMLElement specialisations in the LibDOM source tree, and provide implementations for them. The DOM Level2 specification defines the expected attributes and behaviours of the HTMLElement subclasses and should be used as a reference for the implementation.</p>
+<p>We consider this task to be fairly easy to complete. The number of missing specialisations is quite large, so do not be surprised if it takes longer than expected! We do not expect this phase to fill an entire summer, however.</p>
+<p>Expected outcome: a complete implementation of the HTMLElement DOM classes, which enable the HTMLElement tests in the LibDOM testsuite to pass.</p>
+</dd>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
-</li>
-</ul>
+</dd>
+</dl>
<h4>Phase 2</h4>
-<p>Either one of the following:</p>
-<ul>
-<li>
-<p>Bring Hubbub up to latest HTML5 parsing spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
+<p>Either one of the following options. We expect the decision on the direction of this phase to be made by the student and mentors, depending upon the interests of the student, the ability demonstrated in completing Phase 1, and the time remaining. We do not anticipate that there will be time for a student to complete both items listed here, but the work is there if a gifted student makes good progress.</p>
+<dl>
+<dt>LibHubbub: Update to match current specification</dt>
+<dd>
+<p>LibHubbub is the NetSurf project's HTML parser. It is designed to implement the HTML5 parsing algorithm.</p>
+<p>The current implementation of LibHubbub, however, is out-of-date with respect to the specification. This means that the DOM tree produced by parsing an HTML document using LibHubbub is not equivalent to that produced by a fully-conformant HTML5 parser.</p>
+<p>This task involves identifying the differences between the behaviour implemented in LibHubbub and the expected behaviour defined by the specification. Once these differences have been identified, the implementation in LibHubbub should be brought in line with the specification.</p>
+<p>We expect this task to require a great deal of attention to detail. The initial stage of identifying the places where LibHubbub's implementation does not match the specification is crucial to the success of this task.</p>
+<p>Expected outcome: a detailed summary of the deficiencies in the LibHubbub implementation and a decent amount of progress towards rectifying them, with passing tests in the testsuite.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
-</li>
-<li>
-<p>Add CSS3 properties to LibCSS. There many CSS3 properties that are now in widespread use. Support for these can be added to LibCSS.</p>
+</dd>
+<dt>LibCSS: add support for CSS 3 properties</dt>
+<dd>
+<p>LibCSS is the NetSurf project's CSS parser and style selection engine. It currently has support for parsing and selecting:</p>
+<ul>
+<li>CSS 2.1</li>
+<li>CSS 3 Namespaces</li>
+<li>CSS 3 Selectors</li>
+<li>CSS 3 Color</li>
+<li>CSS 3 Multi-column Layout (parsing only)</li>
+<li>CSS 3 Writing Modes (writing-mode property only)</li>
+</ul>
+<p>This task involves adding support for parsing and selecting properties defined in other CSS 3 module specifications. As CSS 3 is comprised of a very broad suite of components, the precise selection of which modules to target will be decided as part of the task definition with the student.</p>
+<p>Expected outcome: a decision about which CSS 3 component modules to implement; an implementation of the relevant property parsing and selection rules, along with passing test cases for the LibCSS testsuite.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libcss.git/tree/src">libcss/src</a><br><strong>Specification:</strong> <a href="http://www.w3.org/Style/CSS/specs.en.html">CSS Specs</a></p>
</li>
-</ul>
-<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
+</dl>
<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
<h2>Mentors</h2>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 53 +++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 85f3d02..c3fd353 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -59,6 +59,7 @@
<dd>
<ul>
<li>Join our IRC channel <code>#netsurf</code> on <a href="http://freenode.net/">Freenode</a> and introduce yourself. Also, subscribe to the <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</li>
+<li>Ideally students will have a dialogue with us about what they intend to do, before they make their application.</li>
<li>Get up to speed with <a href="http://wiki.netsurf-browser.org/Documentation/GettingCoding">Git</a>, as we use this for source control, and get the NetSurf <a href="http://www.netsurf-browser.org/documentation/develop#SourceControl">source code</a>.</li>
<li><a href="http://www.netsurf-browser.org/documentation/develop#Compiling">Build NetSurf</a> and enjoy using it. (Ask on IRC if you need help.)</li>
<li>Get familiarised with the source code – read the <a href="http://source.netsurf-browser.org/netsurf.git/tree/Docs">code documentation</a>.</li>
@@ -68,11 +69,11 @@
<dt>When applying for a project<dt>
<dd>
<ul>
+<li>Include your IRC nick in your application, so that we recognise you. <strong>We strongly recommend that you communicate with us on <code>#netsurf</code> before submitting an application.</strong></li>
<li>Tell us about yourself, your experience, and why you want to work with us.</li>
<li>Describe the project you want to do, and how you plan to go about doing it. <strong>Do not simply copy the project description from the ideas page.</strong></li>
<li>Create a set of project milestones (ranging from a couple to maximum 10) with expected completion dates. This will be useful for you as guidance and for us to set our expectations right.</li>
<li>Describe how you will test your contributions.</li>
-<li>Include your IRC nick in your application if you've spoken with us on <code>#netsurf</code>, so that we recognise you. <strong>We strongly recommend that you communicate with us before submitting an application.</strong></li>
<li>We expect GSoC to be mostly equivalent to a full-time job. Therefore, please tell us if you have any other demands on your time.</li>
</ul>
<dd>
@@ -99,26 +100,46 @@
</ul>
<h3>Project Outline</h3>
<h4>Phase 1</h4>
-<ul>
-<li>
-<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_button_eleme...">html_button_element.c</a> have implementations, while most like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_anchor_eleme...">html_anchor_element.c</a> do not.</p>
+<dl>
+<dt>LibDOM: Implement missing specialisations of HTMLElement</dt>
+<dd>
+<p>HTMLElement is the base class for representing HTML elements in the DOM. It contains the common data which applies to all HTML elements. Most elements, however, contain additional data or have specialised data processing requirements (for example, a Form element has an action attribute). These elements are represented in the DOM by specialised subclasses of HTMLElement.</p>
+<p>In the LibDOM implementation, many of these specialised subclasses have not been implemented. This means that many elements are still represented by the base HTMLElement class and the specialised data and behaviours are not available.</p>
+<p>The task in this phase, then, is to identify the missing/unimplemented HTMLElement specialisations in the LibDOM source tree, and provide implementations for them. The DOM Level2 specification defines the expected attributes and behaviours of the HTMLElement subclasses and should be used as a reference for the implementation.</p>
+<p>We consider this task to be fairly easy to complete. The number of missing specialisations is quite large, so do not be surprised if it takes longer than expected! We do not expect this phase to fill an entire summer, however.</p>
+<p>Expected outcome: a complete implementation of the HTMLElement DOM classes, which enable the HTMLElement tests in the LibDOM testsuite to pass.</p>
+</dd>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
-</li>
-</ul>
+</dd>
+</dl>
<h4>Phase 2</h4>
-<p>Either one of the following:</p>
-<ul>
-<li>
-<p>Bring Hubbub up to latest HTML5 parsing spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
+<p>Either one of the following options. We expect the decision on the direction of this phase to be made by the student and mentors, depending upon the interests of the student, the ability demonstrated in completing Phase 1, and the time remaining. We do not anticipate that there will be time for a student to complete both items listed here, but the work is there if a gifted student makes good progress.</p>
+<dl>
+<dt>LibHubbub: Update to match current specification</dt>
+<dd>
+<p>LibHubbub is the NetSurf project's HTML parser. It is designed to implement the HTML5 parsing algorithm.</p>
+<p>The current implementation of LibHubbub, however, is out-of-date with respect to the specification. This means that the DOM tree produced by parsing an HTML document using LibHubbub is not equivalent to that produced by a fully-conformant HTML5 parser.</p>
+<p>This task involves identifying the differences between the behaviour implemented in LibHubbub and the expected behaviour defined by the specification. Once these differences have been identified, the implementation in LibHubbub should be brought in line with the specification.</p>
+<p>We expect this task to require a great deal of attention to detail. The initial stage of identifying the places where LibHubbub's implementation does not match the specification is crucial to the success of this task.</p>
+<p>Expected outcome: a detailed summary of the deficiencies in the LibHubbub implementation and a decent amount of progress towards rectifying them, with passing tests in the testsuite.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
-</li>
-<li>
-<p>Add CSS3 properties to LibCSS. There many CSS3 properties that are now in widespread use. Support for these can be added to LibCSS.</p>
+</dd>
+<dt>LibCSS: add support for CSS 3 properties</dt>
+<dd>
+<p>LibCSS is the NetSurf project's CSS parser and style selection engine. It currently has support for parsing and selecting:</p>
+<ul>
+<li>CSS 2.1</li>
+<li>CSS 3 Namespaces</li>
+<li>CSS 3 Selectors</li>
+<li>CSS 3 Color</li>
+<li>CSS 3 Multi-column Layout (parsing only)</li>
+<li>CSS 3 Writing Modes (writing-mode property only)</li>
+</ul>
+<p>This task involves adding support for parsing and selecting properties defined in other CSS 3 module specifications. As CSS 3 is comprised of a very broad suite of components, the precise selection of which modules to target will be decided as part of the task definition with the student.</p>
+<p>Expected outcome: a decision about which CSS 3 component modules to implement; an implementation of the relevant property parsing and selection rules, along with passing test cases for the LibCSS testsuite.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libcss.git/tree/src">libcss/src</a><br><strong>Specification:</strong> <a href="http://www.w3.org/Style/CSS/specs.en.html">CSS Specs</a></p>
</li>
-</ul>
-<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
+</dl>
<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
<h2>Mentors</h2>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf: branch vince/disccache updated. release/3.0-1120-gb9dbf0e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b9dbf0eed06c2b2ed528a...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b9dbf0eed06c2b2ed528ab8...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b9dbf0eed06c2b2ed528ab89b...
The branch, vince/disccache has been updated
via b9dbf0eed06c2b2ed528ab89b2db083a5846b9e3 (commit)
from 16f6457502da8f15c7a56336ec23c4848fe3a9a9 (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=b9dbf0eed06c2b2ed52...
commit b9dbf0eed06c2b2ed528ab89b2db083a5846b9e3
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
log cache control meta information
diff --git a/gtk/llcache.c b/gtk/llcache.c
index 46945ac..666c746 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -179,6 +179,7 @@ retrieve(nsurl *url,
/* retrive cache control info if necessary */
if (cache_control != NULL) {
+ int cnt;
snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
LOG(("Opening info file %s", fname));
@@ -190,7 +191,7 @@ retrieve(nsurl *url,
return NSERROR_NOT_FOUND;
}
- fscanf(file,
+ cnt = fscanf(file,
"req_time:%lld\n"
"res_time:%lld\n"
"fin_time:%lld\n"
@@ -212,6 +213,9 @@ retrieve(nsurl *url,
&cache_control->etag,
(long long*)&cache_control->last_modified);
+ LOG(("Read %d items from cache constrol", cnt));
+
+
fclose(file);
}
-----------------------------------------------------------------------
Summary of changes:
gtk/llcache.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gtk/llcache.c b/gtk/llcache.c
index 46945ac..666c746 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -179,6 +179,7 @@ retrieve(nsurl *url,
/* retrive cache control info if necessary */
if (cache_control != NULL) {
+ int cnt;
snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
LOG(("Opening info file %s", fname));
@@ -190,7 +191,7 @@ retrieve(nsurl *url,
return NSERROR_NOT_FOUND;
}
- fscanf(file,
+ cnt = fscanf(file,
"req_time:%lld\n"
"res_time:%lld\n"
"fin_time:%lld\n"
@@ -212,6 +213,9 @@ retrieve(nsurl *url,
&cache_control->etag,
(long long*)&cache_control->last_modified);
+ LOG(("Read %d items from cache constrol", cnt));
+
+
fclose(file);
}
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch vince/disccache updated. release/3.0-1119-g16f6457
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/16f6457502da8f15c7a56...
...commit http://git.netsurf-browser.org/netsurf.git/commit/16f6457502da8f15c7a5633...
...tree http://git.netsurf-browser.org/netsurf.git/tree/16f6457502da8f15c7a56336e...
The branch, vince/disccache has been updated
via 16f6457502da8f15c7a56336ec23c4848fe3a9a9 (commit)
via a7f9dfe927b696491496095a2b713150d258c879 (commit)
via 9873af9b0e64b87a0c510d0020cb9a0bf13ae53c (commit)
from c940d69028064b5a3ffa38dfd67302ada9eaaaa2 (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=16f6457502da8f15c7a...
commit 16f6457502da8f15c7a56336ec23c4848fe3a9a9
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
store and retrive cache data
diff --git a/gtk/llcache.c b/gtk/llcache.c
index f731cb5..46945ac 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -85,47 +85,87 @@ persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, c
size_t b64ulen;
char *fname;
FILE *file;
- nserror ret= NSERROR_OK;
LOG(("Writing cache file for url:%s", nsurl_access(url)));
b64u = base64url_encode(nsurl_access(url), strlen(nsurl_access(url)), &b64ulen);
- fname = malloc(SLEN("/tmp/ns/") + b64ulen + 1);
- snprintf(fname, SLEN("/tmp/ns/") + b64ulen + 1, "/tmp/ns/%s", b64u);
+ fname = malloc(SLEN("/tmp/ns/d/") + b64ulen + 1);
+ snprintf(fname, SLEN("/tmp/ns/d/") + b64ulen + 1, "/tmp/ns/d/%s", b64u);
- LOG(("Opening file %s",fname));
+ LOG(("Opening data file %s", fname));
file = fopen(fname, "wb");
- free(fname);
- if (file == NULL)
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
return NSERROR_SAVE_FAILED;
+ }
LOG(("Writing %d bytes at %p to file", datalen, data));
if (fwrite(data, datalen, 1, file) != 1) {
- ret = NSERROR_SAVE_FAILED;
LOG(("did not return 1"));
+ fclose(file);
+ free(fname);
+ free(b64u);
+ return NSERROR_SAVE_FAILED;
}
fclose(file);
+
+ snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
+
+ LOG(("Opening info file %s", fname));
+ file = fopen(fname, "wb");
+
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
+ return NSERROR_SAVE_FAILED;
+ }
+
+ fprintf(file,
+ "req_time:%lld\n"
+ "res_time:%lld\n"
+ "fin_time:%lld\n"
+ "date:%lld\n"
+ "expires:%lld\n"
+ "age:%d\n"
+ "max_age:%d\n"
+ "no_cache:%d\n"
+ "etag:%s\n"
+ "last_modified:%lld\n",
+ (long long)cache_control->req_time,
+ (long long)cache_control->res_time,
+ (long long)cache_control->fin_time,
+ (long long)cache_control->date,
+ (long long)cache_control->expires,
+ cache_control->age,
+ cache_control->max_age,
+ cache_control->no_cache,
+ cache_control->etag == NULL?"":cache_control->etag,
+ (long long)cache_control->last_modified);
+
+ fclose(file);
+
+ free(fname);
free(b64u);
- return ret;
+ return NSERROR_OK;
}
static nserror
-retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
+retrieve(nsurl *url,
+ llcache_cache_control *cache_control,
+ uint8_t **data_out,
+ size_t *datalen_out)
{
uint8_t *b64u;
size_t b64ulen;
char *fname;
FILE *file;
- nserror ret= NSERROR_OK;
uint8_t *data;
size_t datalen;
- if (cache_control != NULL) {
- return NSERROR_NOT_FOUND;
- }
data = *data_out;
datalen = *datalen_out;
@@ -135,8 +175,48 @@ retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, s
strlen(nsurl_access(url)),
&b64ulen);
- fname = malloc(SLEN("/tmp/ns/") + b64ulen + 1);
- snprintf(fname, SLEN("/tmp/ns/") + b64ulen + 1, "/tmp/ns/%s", b64u);
+ fname = malloc(SLEN("/tmp/ns/d/") + b64ulen + 1);
+
+ /* retrive cache control info if necessary */
+ if (cache_control != NULL) {
+ snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
+
+ LOG(("Opening info file %s", fname));
+ file = fopen(fname, "rb");
+
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
+ return NSERROR_NOT_FOUND;
+ }
+
+ fscanf(file,
+ "req_time:%lld\n"
+ "res_time:%lld\n"
+ "fin_time:%lld\n"
+ "date:%lld\n"
+ "expires:%lld\n"
+ "age:%d\n"
+ "max_age:%d\n"
+ "no_cache:%d\n"
+ "etag:%ms\n"
+ "last_modified:%lld\n",
+ (long long*)&cache_control->req_time,
+ (long long*)&cache_control->res_time,
+ (long long*)&cache_control->fin_time,
+ (long long*)&cache_control->date,
+ (long long*)&cache_control->expires,
+ &cache_control->age,
+ &cache_control->max_age,
+ (int *)&cache_control->no_cache,
+ &cache_control->etag,
+ (long long*)&cache_control->last_modified);
+
+ fclose(file);
+
+ }
+
+ snprintf(fname, SLEN("/tmp/ns/d/") + b64ulen + 1, "/tmp/ns/d/%s", b64u);
LOG(("Opening file %s",fname));
file = fopen(fname, "rb");
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a7f9dfe927b69649149...
commit a7f9dfe927b696491496095a2b713150d258c879
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
working basic persistant sorage for gtk frontend
diff --git a/content/llcache.c b/content/llcache.c
index 87e1692..ed42895 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -1030,7 +1030,7 @@ llcache_persist_retrieve(llcache_object *object)
/* Source data for the object may be in the persiatant store */
return guit->llcache->retrieve(object->url,
- &object->cache,
+ NULL,
&object->source_data,
&object->source_len);
}
@@ -1102,7 +1102,7 @@ llcache_object_retrieve_from_cache(nsurl *url,
llcache_object *obj, *newest = NULL;
#ifdef LLCACHE_TRACE
- LOG(("Searching cache for %s (%x %s %p)",
+ LOG(("Searching cache for %s flags:%x referer:%s post:%p",
nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
diff --git a/gtk/llcache.c b/gtk/llcache.c
index e6bf7aa..f731cb5 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -20,24 +20,167 @@
* Low-level resource cache persistant storage implementation.
*/
+#include <string.h>
+
#include "utils/nsurl.h"
#include "utils/log.h"
+#include "utils/utils.h"
#include "desktop/gui.h"
#include "content/llcache_private.h"
#include "gtk/llcache.h"
+static uint8_t encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+ 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ '4', '5', '6', '7', '8', '9', '-', '_'};
+static unsigned int mod_table[] = {0, 2, 1};
+
+
+static uint8_t *base64url_encode(const char *data,
+ size_t input_length,
+ size_t *output_length)
+{
+ uint8_t *encoded_data;
+ size_t i;
+ size_t j;
+
+ *output_length = 4 * ((input_length + 2) / 3);
+
+ encoded_data = malloc(*output_length + 1);
+ if (encoded_data == NULL) {
+ return NULL;
+ }
+
+ for (i = 0, j = 0; i < input_length;) {
+
+ uint32_t octet_a = i < input_length ? data[i++] : 0;
+ uint32_t octet_b = i < input_length ? data[i++] : 0;
+ uint32_t octet_c = i < input_length ? data[i++] : 0;
+
+ uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+ encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F];
+ }
+
+ for (i = 0; i < mod_table[input_length % 3]; i++) {
+ encoded_data[*output_length - 1 - i] = 0;
+ (*output_length)--;
+ }
+
+ return encoded_data;
+}
+
static nserror
persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
+ uint8_t *b64u;
+ size_t b64ulen;
+ char *fname;
+ FILE *file;
+ nserror ret= NSERROR_OK;
+
LOG(("Writing cache file for url:%s", nsurl_access(url)));
- return NSERROR_OK;
+ b64u = base64url_encode(nsurl_access(url), strlen(nsurl_access(url)), &b64ulen);
+
+ fname = malloc(SLEN("/tmp/ns/") + b64ulen + 1);
+ snprintf(fname, SLEN("/tmp/ns/") + b64ulen + 1, "/tmp/ns/%s", b64u);
+
+ LOG(("Opening file %s",fname));
+ file = fopen(fname, "wb");
+ free(fname);
+
+ if (file == NULL)
+ return NSERROR_SAVE_FAILED;
+
+ LOG(("Writing %d bytes at %p to file", datalen, data));
+ if (fwrite(data, datalen, 1, file) != 1) {
+ ret = NSERROR_SAVE_FAILED;
+ LOG(("did not return 1"));
+ }
+
+ fclose(file);
+ free(b64u);
+
+ return ret;
}
static nserror
retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
{
- return NSERROR_NOT_FOUND;
+ uint8_t *b64u;
+ size_t b64ulen;
+ char *fname;
+ FILE *file;
+ nserror ret= NSERROR_OK;
+ uint8_t *data;
+ size_t datalen;
+
+ if (cache_control != NULL) {
+ return NSERROR_NOT_FOUND;
+ }
+
+ data = *data_out;
+ datalen = *datalen_out;
+
+ LOG(("retriving cache file for url:%s", nsurl_access(url)));
+ b64u = base64url_encode(nsurl_access(url),
+ strlen(nsurl_access(url)),
+ &b64ulen);
+
+ fname = malloc(SLEN("/tmp/ns/") + b64ulen + 1);
+ snprintf(fname, SLEN("/tmp/ns/") + b64ulen + 1, "/tmp/ns/%s", b64u);
+
+ LOG(("Opening file %s",fname));
+ file = fopen(fname, "rb");
+ free(fname);
+ if (file == NULL) {
+ free(b64u);
+ return NSERROR_NOT_FOUND;
+ }
+
+ /* need to deal with buffers */
+ if (data == NULL) {
+ if (datalen == 0) {
+ /* caller did not know the files length */
+ fseek(file, 0L, SEEK_END);
+ datalen = ftell(file);
+ fseek(file, 0L, SEEK_SET);
+ }
+
+ data = malloc(datalen);
+ if (data == NULL) {
+ fclose(file);
+ free(b64u);
+ return NSERROR_NOMEM;
+ }
+ }
+
+ LOG(("Reading %d bytes into %p from file", datalen, data));
+ if (fread(data, datalen, 1, file) != 1) {
+ LOG(("did not return 1"));
+ fclose(file);
+ free(b64u);
+ if ((*data_out) == NULL) {
+ free(data);
+ }
+ return NSERROR_NOT_FOUND;
+ }
+
+ fclose(file);
+ free(b64u);
+
+ *data_out = data;
+ *datalen_out = datalen;
+
+ return NSERROR_OK;
}
static struct gui_llcache_table llcache_table = {
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9873af9b0e64b87a0c5...
commit 9873af9b0e64b87a0c510d0020cb9a0bf13ae53c
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
add sha1 implementation and tests
diff --git a/test/Makefile b/test/Makefile
index acf9d4e..825b582 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,7 @@ CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+
llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
@@ -14,6 +15,7 @@ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
utils/log.c utils/nsurl.c utils/messages.c utils/url.c \
utils/useragent.c utils/utils.c test/llcache.c
+
urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
desktop/options.c utils/messages.c utils/hashtable.c \
utils/filename.c utils/nsurl.c utils/corestrings.c \
@@ -22,16 +24,22 @@ urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+
nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c test/nsurl.c
nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+
nsoption_SRCS := utils/log.c utils/nsoption.c test/nsoption.c
nsoption_CFLAGS := -Dnsgtk
+sha1_SRCS := utils/sha1.c utils/log.c test/sha1.c
+sha1_CFLAGS :=
+sha1_LDFLAGS :=
+
.PHONY: all
-all: llcache urldbtest nsurl nsoption
+all: llcache urldbtest nsurl nsoption sha1
llcache: $(addprefix ../,$(llcache_SRCS))
$(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS)
@@ -45,6 +53,9 @@ nsurl: $(addprefix ../,$(nsurl_SRCS))
nsoption: $(addprefix ../,$(nsoption_SRCS))
$(CC) $(CFLAGS) $(nsoption_CFLAGS) $^ -o $@ $(LDFLAGS) $(nsoption_LDFLAGS)
+sha1: $(addprefix ../,$(sha1_SRCS))
+ $(CC) $(CFLAGS) $(sha1_CFLAGS) $^ -o $@ $(LDFLAGS) $(sha1_LDFLAGS)
+
.PHONY: clean
clean:
diff --git a/test/sha1.c b/test/sha1.c
new file mode 100644
index 0000000..abfc25b
--- /dev/null
+++ b/test/sha1.c
@@ -0,0 +1,50 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "utils/log.h"
+#include "utils/sha1.h"
+
+
+struct {
+ const char *text;
+ const uint8_t hash[NSSHA1_DIGEST_SIZE];
+} checks[] = {
+ {
+ "The quick brown fox jumps over the lazy dog",
+ { 0x2f, 0xd4, 0xe1, 0xc6, 0x7a, 0x2d, 0x28, 0xfc, 0xed, 0x84,
+ 0x9e, 0xe1, 0xbb, 0x76, 0xe7, 0x39, 0x1b, 0x93, 0xeb, 0x12 }
+ },
+ {
+ "The quick brown fox jumps over the lazy cog",
+ { 0xde, 0x9f, 0x2c, 0x7f, 0xd2, 0x5e, 0x1b, 0x3a, 0xfa, 0xd3,
+ 0xe8, 0x5a, 0x0b, 0xd1, 0x7d, 0x9b, 0x10, 0x0d, 0xb4, 0xb3 }
+ },
+ {
+ "",
+ { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55,
+ 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09 }
+ },
+ { NULL, {0} },
+};
+
+int main(int argc, char **argv)
+{
+ uint8_t res[NSSHA1_DIGEST_SIZE];
+ int chk_loop = 0;
+
+ verbose_log = true;
+
+ while (checks[chk_loop].text != NULL) {
+
+ NSSHA1(checks[chk_loop].text, strlen(checks[chk_loop].text), res);
+ if (memcmp(res, &checks[chk_loop].hash, NSSHA1_DIGEST_SIZE) == 0) {
+ LOG(("Test %d: PASS", chk_loop));
+ } else {
+ LOG(("Test %d: FAIL", chk_loop));
+ }
+ chk_loop++;
+ }
+}
diff --git a/utils/Makefile b/utils/Makefile
index aef5799..48bba98 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -2,6 +2,6 @@
S_UTILS := base64.c corestrings.c filename.c filepath.c hashtable.c \
libdom.c locale.c log.c messages.c nsurl.c talloc.c url.c \
- utf8.c utils.c useragent.c bloom.c nsoption.c
+ utf8.c utils.c useragent.c bloom.c nsoption.c sha1.c
S_UTILS := $(addprefix utils/,$(S_UTILS))
diff --git a/utils/sha1.c b/utils/sha1.c
new file mode 100644
index 0000000..882f2b9
--- /dev/null
+++ b/utils/sha1.c
@@ -0,0 +1,264 @@
+/*
+ SHA-1 in C
+ By Steve Reid <sreid(a)sea-to-sky.net>
+ 100% Public Domain
+
+ -----------------
+ Modified 7/98
+ By James H. Brown <jbrown(a)burgoyne.com>
+ Still 100% Public Domain
+
+ Corrected a problem which generated improper hash values on 16 bit machines
+ Routine SHA1Update changed from
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+ len)
+ to
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+ long len)
+
+ The 'len' parameter was declared an int which works fine on 32 bit machines.
+ However, on 16 bit machines an int is too small for the shifts being done
+ against
+ it. This caused the hash function to generate incorrect values if len was
+ greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+ Since the file IO in main() reads 16K at a time, any file 8K or larger would
+ be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+ "a"s).
+
+ I also changed the declaration of variables i & j in SHA1Update to
+ unsigned long from unsigned int for the same reason.
+
+ These changes should make no difference to any 32 bit implementations since
+ an
+ int and a long are the same size in those environments.
+
+ --
+ I also corrected a few compiler warnings generated by Borland C.
+ 1. Added #include <process.h> for exit() prototype
+ 2. Removed unused variable 'j' in SHA1Final
+ 3. Changed exit(0) to return(0) at end of main.
+
+ ALL changes I made can be located by searching for comments containing 'JHB'
+ -----------------
+ Modified 8/98
+ By Steve Reid <sreid(a)sea-to-sky.net>
+ Still 100% public domain
+
+ 1- Removed #include <process.h> and used return() instead of exit()
+ 2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+ 3- Changed email address from steve(a)edmweb.com to sreid(a)sea-to-sky.net
+
+ -----------------
+ Modified 4/01
+ By Saul Kravitz <Saul.Kravitz(a)celera.com>
+ Still 100% PD
+ Modified to run on Compaq Alpha hardware.
+
+ -----------------
+ Modified 07/2002
+ By Ralph Giles <giles(a)ghostscript.com>
+ Still 100% public domain
+ modified for use with stdint types, autoconf
+ code cleanup, removed attribution comments
+ switched SHA1Final() argument order for consistency
+ use SHA1_ prefix for public api
+ move public api to sha1.h
+*/
+
+/** \file
+ * steve reid's public domain SHA-1 implementation.
+ *
+ * Modified by Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This is a sligly modified version of this public domain
+ * implementation changes were made to:
+ * - introduce suitable prefixes to avoid namespace conflicts.
+ * - make the context structure self contained.
+ * - make the function signatures more suitable for this use case
+ */
+
+
+/* see https://en.wikipedia.org/wiki/SHA-1 */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/sha1.h"
+
+struct nssha1_ctx {
+ uint32_t state[5];
+ uint32_t count[2];
+ uint8_t buffer[64];
+} ;
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+/* FIXME: can we do this in an endian-proof way? */
+#ifdef WORDS_BIGENDIAN
+#define blk0(i) block->l[i]
+#else
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+ |(rol(block->l[i],8)&0x00FF00FF))
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+ ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+ uint32_t a, b, c, d, e;
+ typedef union {
+ uint8_t c[64];
+ uint32_t l[16];
+ } CHAR64LONG16;
+ CHAR64LONG16* block;
+
+ block = (CHAR64LONG16*)buffer;
+
+ /* Copy context->state[] to working vars */
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+
+ /* 4 rounds of 20 operations each. Loop unrolled. */
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+ /* Add the working vars back into context.state[] */
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+
+ /* Wipe variables */
+ a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+nserror
+NSSHA1_Init(struct nssha1_ctx **ret_ctx)
+{
+ struct nssha1_ctx *context;
+
+ context = calloc(1, sizeof(struct nssha1_ctx));
+ if (context == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* SHA1 initialization constants */
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xEFCDAB89;
+ context->state[2] = 0x98BADCFE;
+ context->state[3] = 0x10325476;
+ context->state[4] = 0xC3D2E1F0;
+ context->count[0] = context->count[1] = 0;
+
+ *ret_ctx = context;
+
+ return NSERROR_OK;
+}
+
+
+/* Run your data through this. */
+nserror
+NSSHA1_Update(struct nssha1_ctx *context, const uint8_t *data, const size_t len)
+{
+ size_t i, j;
+
+ j = (context->count[0] >> 3) & 63;
+ if ((context->count[0] += len << 3) < (len << 3)) {
+ context->count[1]++;
+ }
+ context->count[1] += (len >> 29);
+ if ((j + len) > 63) {
+ memcpy(&context->buffer[j], data, (i = 64-j));
+ SHA1_Transform(context->state, context->buffer);
+ for ( ; i + 63 < len; i += 64) {
+ SHA1_Transform(context->state, data + i);
+ }
+ j = 0;
+ } else {
+ i = 0;
+ }
+ memcpy(&context->buffer[j], &data[i], len - i);
+
+ return NSERROR_OK;
+}
+
+
+/* Add padding and return the message digest. */
+nserror
+NSSHA1_Final(struct nssha1_ctx *context, uint8_t digest[NSSHA1_DIGEST_SIZE])
+{
+ uint32_t i;
+ uint8_t finalcount[8];
+
+ for (i = 0; i < 8; i++) {
+ finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
+ }
+ NSSHA1_Update(context, (uint8_t *)"\200", 1);
+ while ((context->count[0] & 504) != 448) {
+ NSSHA1_Update(context, (uint8_t *)"\0", 1);
+ }
+ NSSHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
+ for (i = 0; i < NSSHA1_DIGEST_SIZE; i++) {
+ digest[i] = (uint8_t)
+ ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+ }
+
+ free(context);
+
+ return NSERROR_OK;
+}
+
+nserror
+NSSHA1(const uint8_t *data, const size_t len, uint8_t digest[NSSHA1_DIGEST_SIZE])
+{
+ struct nssha1_ctx *context;
+ nserror error;
+
+ error = NSSHA1_Init(&context);
+ if (error != NSERROR_OK)
+ return error;
+ NSSHA1_Update(context, data, len);
+ NSSHA1_Final(context, digest);
+
+ return NSERROR_OK;
+}
diff --git a/utils/sha1.h b/utils/sha1.h
new file mode 100644
index 0000000..e9f930c
--- /dev/null
+++ b/utils/sha1.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * interface for steve reid's public domain SHA-1 implementation.
+ *
+ * The exposed API makes only minimal changes to the public domain
+ * implementation, mainly adding a prefix so this implementation is
+ * not confused with any other similarly named version that might be
+ * linked.
+ */
+
+#ifndef _NETSURF_UTILS_SHA1_H_
+#define _NETSURF_UTILS_SHA1_H_
+
+struct nssha1_ctx;
+
+#define NSSHA1_DIGEST_SIZE 20
+
+/**
+ * Initialise a SHA1 context ready to take updates
+ *
+ * The context is allocated by this routine and destroyed by the finaliser.
+ *
+ * @param context receives an initialised SHA1 context.
+ * @return NSERROR_OK and \a context updated on sucess or
+ * NSERROR_NOMEM on memory exhaustion.
+ */
+nserror NSSHA1_Init(struct nssha1_ctx **context);
+
+/**
+ * Update an SHA1 context with additional data.
+ *
+ * @param context The context created by NSSHA1_Init
+ * @param data The data to hash.
+ * @param len The length of data to hash.
+ * @return NSERROR_OK
+ */
+nserror NSSHA1_Update(struct nssha1_ctx *context, const uint8_t *data, const size_t len);
+
+/**
+ * Finalise a SHA1 hash.
+ *
+ * Frees the context.
+ *
+ * @param context The context created by NSSHA1_Init
+ * @param digest a buffer to store the results in.
+ * @return NSERROR_OK
+ */
+nserror NSSHA1_Final(struct nssha1_ctx *context, uint8_t digest[NSSHA1_DIGEST_SIZE]);
+
+/**
+ * Generate SHA1 of some data
+ */
+nserror NSSHA1(const uint8_t *data, const size_t len, uint8_t digest[NSSHA1_DIGEST_SIZE]);
+
+#endif
-----------------------------------------------------------------------
Summary of changes:
content/llcache.c | 4 +-
gtk/llcache.c | 227 +++++++++++++++++++++++++++++++++++++++++++++-
test/Makefile | 13 +++-
test/sha1.c | 50 ++++++++++
utils/Makefile | 2 +-
utils/sha1.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++
utils/sha1.h | 72 +++++++++++++++
7 files changed, 626 insertions(+), 6 deletions(-)
create mode 100644 test/sha1.c
create mode 100644 utils/sha1.c
create mode 100644 utils/sha1.h
diff --git a/content/llcache.c b/content/llcache.c
index 87e1692..ed42895 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -1030,7 +1030,7 @@ llcache_persist_retrieve(llcache_object *object)
/* Source data for the object may be in the persiatant store */
return guit->llcache->retrieve(object->url,
- &object->cache,
+ NULL,
&object->source_data,
&object->source_len);
}
@@ -1102,7 +1102,7 @@ llcache_object_retrieve_from_cache(nsurl *url,
llcache_object *obj, *newest = NULL;
#ifdef LLCACHE_TRACE
- LOG(("Searching cache for %s (%x %s %p)",
+ LOG(("Searching cache for %s flags:%x referer:%s post:%p",
nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
diff --git a/gtk/llcache.c b/gtk/llcache.c
index e6bf7aa..46945ac 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -20,24 +20,247 @@
* Low-level resource cache persistant storage implementation.
*/
+#include <string.h>
+
#include "utils/nsurl.h"
#include "utils/log.h"
+#include "utils/utils.h"
#include "desktop/gui.h"
#include "content/llcache_private.h"
#include "gtk/llcache.h"
+static uint8_t encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+ 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ '4', '5', '6', '7', '8', '9', '-', '_'};
+static unsigned int mod_table[] = {0, 2, 1};
+
+
+static uint8_t *base64url_encode(const char *data,
+ size_t input_length,
+ size_t *output_length)
+{
+ uint8_t *encoded_data;
+ size_t i;
+ size_t j;
+
+ *output_length = 4 * ((input_length + 2) / 3);
+
+ encoded_data = malloc(*output_length + 1);
+ if (encoded_data == NULL) {
+ return NULL;
+ }
+
+ for (i = 0, j = 0; i < input_length;) {
+
+ uint32_t octet_a = i < input_length ? data[i++] : 0;
+ uint32_t octet_b = i < input_length ? data[i++] : 0;
+ uint32_t octet_c = i < input_length ? data[i++] : 0;
+
+ uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+ encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F];
+ encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F];
+ }
+
+ for (i = 0; i < mod_table[input_length % 3]; i++) {
+ encoded_data[*output_length - 1 - i] = 0;
+ (*output_length)--;
+ }
+
+ return encoded_data;
+}
+
static nserror
persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
+ uint8_t *b64u;
+ size_t b64ulen;
+ char *fname;
+ FILE *file;
+
LOG(("Writing cache file for url:%s", nsurl_access(url)));
+ b64u = base64url_encode(nsurl_access(url), strlen(nsurl_access(url)), &b64ulen);
+
+ fname = malloc(SLEN("/tmp/ns/d/") + b64ulen + 1);
+ snprintf(fname, SLEN("/tmp/ns/d/") + b64ulen + 1, "/tmp/ns/d/%s", b64u);
+
+ LOG(("Opening data file %s", fname));
+ file = fopen(fname, "wb");
+
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
+ return NSERROR_SAVE_FAILED;
+ }
+
+ LOG(("Writing %d bytes at %p to file", datalen, data));
+ if (fwrite(data, datalen, 1, file) != 1) {
+ LOG(("did not return 1"));
+ fclose(file);
+ free(fname);
+ free(b64u);
+ return NSERROR_SAVE_FAILED;
+ }
+
+ fclose(file);
+
+ snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
+
+ LOG(("Opening info file %s", fname));
+ file = fopen(fname, "wb");
+
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
+ return NSERROR_SAVE_FAILED;
+ }
+
+ fprintf(file,
+ "req_time:%lld\n"
+ "res_time:%lld\n"
+ "fin_time:%lld\n"
+ "date:%lld\n"
+ "expires:%lld\n"
+ "age:%d\n"
+ "max_age:%d\n"
+ "no_cache:%d\n"
+ "etag:%s\n"
+ "last_modified:%lld\n",
+ (long long)cache_control->req_time,
+ (long long)cache_control->res_time,
+ (long long)cache_control->fin_time,
+ (long long)cache_control->date,
+ (long long)cache_control->expires,
+ cache_control->age,
+ cache_control->max_age,
+ cache_control->no_cache,
+ cache_control->etag == NULL?"":cache_control->etag,
+ (long long)cache_control->last_modified);
+
+ fclose(file);
+
+ free(fname);
+ free(b64u);
+
return NSERROR_OK;
}
static nserror
-retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
+retrieve(nsurl *url,
+ llcache_cache_control *cache_control,
+ uint8_t **data_out,
+ size_t *datalen_out)
{
- return NSERROR_NOT_FOUND;
+ uint8_t *b64u;
+ size_t b64ulen;
+ char *fname;
+ FILE *file;
+ uint8_t *data;
+ size_t datalen;
+
+
+ data = *data_out;
+ datalen = *datalen_out;
+
+ LOG(("retriving cache file for url:%s", nsurl_access(url)));
+ b64u = base64url_encode(nsurl_access(url),
+ strlen(nsurl_access(url)),
+ &b64ulen);
+
+ fname = malloc(SLEN("/tmp/ns/d/") + b64ulen + 1);
+
+ /* retrive cache control info if necessary */
+ if (cache_control != NULL) {
+ snprintf(fname, SLEN("/tmp/ns/i/") + b64ulen + 1, "/tmp/ns/i/%s", b64u);
+
+ LOG(("Opening info file %s", fname));
+ file = fopen(fname, "rb");
+
+ if (file == NULL) {
+ free(fname);
+ free(b64u);
+ return NSERROR_NOT_FOUND;
+ }
+
+ fscanf(file,
+ "req_time:%lld\n"
+ "res_time:%lld\n"
+ "fin_time:%lld\n"
+ "date:%lld\n"
+ "expires:%lld\n"
+ "age:%d\n"
+ "max_age:%d\n"
+ "no_cache:%d\n"
+ "etag:%ms\n"
+ "last_modified:%lld\n",
+ (long long*)&cache_control->req_time,
+ (long long*)&cache_control->res_time,
+ (long long*)&cache_control->fin_time,
+ (long long*)&cache_control->date,
+ (long long*)&cache_control->expires,
+ &cache_control->age,
+ &cache_control->max_age,
+ (int *)&cache_control->no_cache,
+ &cache_control->etag,
+ (long long*)&cache_control->last_modified);
+
+ fclose(file);
+
+ }
+
+ snprintf(fname, SLEN("/tmp/ns/d/") + b64ulen + 1, "/tmp/ns/d/%s", b64u);
+
+ LOG(("Opening file %s",fname));
+ file = fopen(fname, "rb");
+ free(fname);
+ if (file == NULL) {
+ free(b64u);
+ return NSERROR_NOT_FOUND;
+ }
+
+ /* need to deal with buffers */
+ if (data == NULL) {
+ if (datalen == 0) {
+ /* caller did not know the files length */
+ fseek(file, 0L, SEEK_END);
+ datalen = ftell(file);
+ fseek(file, 0L, SEEK_SET);
+ }
+
+ data = malloc(datalen);
+ if (data == NULL) {
+ fclose(file);
+ free(b64u);
+ return NSERROR_NOMEM;
+ }
+ }
+
+ LOG(("Reading %d bytes into %p from file", datalen, data));
+ if (fread(data, datalen, 1, file) != 1) {
+ LOG(("did not return 1"));
+ fclose(file);
+ free(b64u);
+ if ((*data_out) == NULL) {
+ free(data);
+ }
+ return NSERROR_NOT_FOUND;
+ }
+
+ fclose(file);
+ free(b64u);
+
+ *data_out = data;
+ *datalen_out = datalen;
+
+ return NSERROR_OK;
}
static struct gui_llcache_table llcache_table = {
diff --git a/test/Makefile b/test/Makefile
index acf9d4e..825b582 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,6 +2,7 @@ CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+
llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
@@ -14,6 +15,7 @@ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
utils/log.c utils/nsurl.c utils/messages.c utils/url.c \
utils/useragent.c utils/utils.c test/llcache.c
+
urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
desktop/options.c utils/messages.c utils/hashtable.c \
utils/filename.c utils/nsurl.c utils/corestrings.c \
@@ -22,16 +24,22 @@ urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+
nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c test/nsurl.c
nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+
nsoption_SRCS := utils/log.c utils/nsoption.c test/nsoption.c
nsoption_CFLAGS := -Dnsgtk
+sha1_SRCS := utils/sha1.c utils/log.c test/sha1.c
+sha1_CFLAGS :=
+sha1_LDFLAGS :=
+
.PHONY: all
-all: llcache urldbtest nsurl nsoption
+all: llcache urldbtest nsurl nsoption sha1
llcache: $(addprefix ../,$(llcache_SRCS))
$(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS)
@@ -45,6 +53,9 @@ nsurl: $(addprefix ../,$(nsurl_SRCS))
nsoption: $(addprefix ../,$(nsoption_SRCS))
$(CC) $(CFLAGS) $(nsoption_CFLAGS) $^ -o $@ $(LDFLAGS) $(nsoption_LDFLAGS)
+sha1: $(addprefix ../,$(sha1_SRCS))
+ $(CC) $(CFLAGS) $(sha1_CFLAGS) $^ -o $@ $(LDFLAGS) $(sha1_LDFLAGS)
+
.PHONY: clean
clean:
diff --git a/test/sha1.c b/test/sha1.c
new file mode 100644
index 0000000..abfc25b
--- /dev/null
+++ b/test/sha1.c
@@ -0,0 +1,50 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "utils/log.h"
+#include "utils/sha1.h"
+
+
+struct {
+ const char *text;
+ const uint8_t hash[NSSHA1_DIGEST_SIZE];
+} checks[] = {
+ {
+ "The quick brown fox jumps over the lazy dog",
+ { 0x2f, 0xd4, 0xe1, 0xc6, 0x7a, 0x2d, 0x28, 0xfc, 0xed, 0x84,
+ 0x9e, 0xe1, 0xbb, 0x76, 0xe7, 0x39, 0x1b, 0x93, 0xeb, 0x12 }
+ },
+ {
+ "The quick brown fox jumps over the lazy cog",
+ { 0xde, 0x9f, 0x2c, 0x7f, 0xd2, 0x5e, 0x1b, 0x3a, 0xfa, 0xd3,
+ 0xe8, 0x5a, 0x0b, 0xd1, 0x7d, 0x9b, 0x10, 0x0d, 0xb4, 0xb3 }
+ },
+ {
+ "",
+ { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55,
+ 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09 }
+ },
+ { NULL, {0} },
+};
+
+int main(int argc, char **argv)
+{
+ uint8_t res[NSSHA1_DIGEST_SIZE];
+ int chk_loop = 0;
+
+ verbose_log = true;
+
+ while (checks[chk_loop].text != NULL) {
+
+ NSSHA1(checks[chk_loop].text, strlen(checks[chk_loop].text), res);
+ if (memcmp(res, &checks[chk_loop].hash, NSSHA1_DIGEST_SIZE) == 0) {
+ LOG(("Test %d: PASS", chk_loop));
+ } else {
+ LOG(("Test %d: FAIL", chk_loop));
+ }
+ chk_loop++;
+ }
+}
diff --git a/utils/Makefile b/utils/Makefile
index aef5799..48bba98 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -2,6 +2,6 @@
S_UTILS := base64.c corestrings.c filename.c filepath.c hashtable.c \
libdom.c locale.c log.c messages.c nsurl.c talloc.c url.c \
- utf8.c utils.c useragent.c bloom.c nsoption.c
+ utf8.c utils.c useragent.c bloom.c nsoption.c sha1.c
S_UTILS := $(addprefix utils/,$(S_UTILS))
diff --git a/utils/sha1.c b/utils/sha1.c
new file mode 100644
index 0000000..882f2b9
--- /dev/null
+++ b/utils/sha1.c
@@ -0,0 +1,264 @@
+/*
+ SHA-1 in C
+ By Steve Reid <sreid(a)sea-to-sky.net>
+ 100% Public Domain
+
+ -----------------
+ Modified 7/98
+ By James H. Brown <jbrown(a)burgoyne.com>
+ Still 100% Public Domain
+
+ Corrected a problem which generated improper hash values on 16 bit machines
+ Routine SHA1Update changed from
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+ len)
+ to
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+ long len)
+
+ The 'len' parameter was declared an int which works fine on 32 bit machines.
+ However, on 16 bit machines an int is too small for the shifts being done
+ against
+ it. This caused the hash function to generate incorrect values if len was
+ greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+ Since the file IO in main() reads 16K at a time, any file 8K or larger would
+ be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+ "a"s).
+
+ I also changed the declaration of variables i & j in SHA1Update to
+ unsigned long from unsigned int for the same reason.
+
+ These changes should make no difference to any 32 bit implementations since
+ an
+ int and a long are the same size in those environments.
+
+ --
+ I also corrected a few compiler warnings generated by Borland C.
+ 1. Added #include <process.h> for exit() prototype
+ 2. Removed unused variable 'j' in SHA1Final
+ 3. Changed exit(0) to return(0) at end of main.
+
+ ALL changes I made can be located by searching for comments containing 'JHB'
+ -----------------
+ Modified 8/98
+ By Steve Reid <sreid(a)sea-to-sky.net>
+ Still 100% public domain
+
+ 1- Removed #include <process.h> and used return() instead of exit()
+ 2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+ 3- Changed email address from steve(a)edmweb.com to sreid(a)sea-to-sky.net
+
+ -----------------
+ Modified 4/01
+ By Saul Kravitz <Saul.Kravitz(a)celera.com>
+ Still 100% PD
+ Modified to run on Compaq Alpha hardware.
+
+ -----------------
+ Modified 07/2002
+ By Ralph Giles <giles(a)ghostscript.com>
+ Still 100% public domain
+ modified for use with stdint types, autoconf
+ code cleanup, removed attribution comments
+ switched SHA1Final() argument order for consistency
+ use SHA1_ prefix for public api
+ move public api to sha1.h
+*/
+
+/** \file
+ * steve reid's public domain SHA-1 implementation.
+ *
+ * Modified by Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This is a sligly modified version of this public domain
+ * implementation changes were made to:
+ * - introduce suitable prefixes to avoid namespace conflicts.
+ * - make the context structure self contained.
+ * - make the function signatures more suitable for this use case
+ */
+
+
+/* see https://en.wikipedia.org/wiki/SHA-1 */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/sha1.h"
+
+struct nssha1_ctx {
+ uint32_t state[5];
+ uint32_t count[2];
+ uint8_t buffer[64];
+} ;
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+/* FIXME: can we do this in an endian-proof way? */
+#ifdef WORDS_BIGENDIAN
+#define blk0(i) block->l[i]
+#else
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+ |(rol(block->l[i],8)&0x00FF00FF))
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+ ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+ uint32_t a, b, c, d, e;
+ typedef union {
+ uint8_t c[64];
+ uint32_t l[16];
+ } CHAR64LONG16;
+ CHAR64LONG16* block;
+
+ block = (CHAR64LONG16*)buffer;
+
+ /* Copy context->state[] to working vars */
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+
+ /* 4 rounds of 20 operations each. Loop unrolled. */
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+ /* Add the working vars back into context.state[] */
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+
+ /* Wipe variables */
+ a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+nserror
+NSSHA1_Init(struct nssha1_ctx **ret_ctx)
+{
+ struct nssha1_ctx *context;
+
+ context = calloc(1, sizeof(struct nssha1_ctx));
+ if (context == NULL) {
+ return NSERROR_NOMEM;
+ }
+
+ /* SHA1 initialization constants */
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xEFCDAB89;
+ context->state[2] = 0x98BADCFE;
+ context->state[3] = 0x10325476;
+ context->state[4] = 0xC3D2E1F0;
+ context->count[0] = context->count[1] = 0;
+
+ *ret_ctx = context;
+
+ return NSERROR_OK;
+}
+
+
+/* Run your data through this. */
+nserror
+NSSHA1_Update(struct nssha1_ctx *context, const uint8_t *data, const size_t len)
+{
+ size_t i, j;
+
+ j = (context->count[0] >> 3) & 63;
+ if ((context->count[0] += len << 3) < (len << 3)) {
+ context->count[1]++;
+ }
+ context->count[1] += (len >> 29);
+ if ((j + len) > 63) {
+ memcpy(&context->buffer[j], data, (i = 64-j));
+ SHA1_Transform(context->state, context->buffer);
+ for ( ; i + 63 < len; i += 64) {
+ SHA1_Transform(context->state, data + i);
+ }
+ j = 0;
+ } else {
+ i = 0;
+ }
+ memcpy(&context->buffer[j], &data[i], len - i);
+
+ return NSERROR_OK;
+}
+
+
+/* Add padding and return the message digest. */
+nserror
+NSSHA1_Final(struct nssha1_ctx *context, uint8_t digest[NSSHA1_DIGEST_SIZE])
+{
+ uint32_t i;
+ uint8_t finalcount[8];
+
+ for (i = 0; i < 8; i++) {
+ finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
+ }
+ NSSHA1_Update(context, (uint8_t *)"\200", 1);
+ while ((context->count[0] & 504) != 448) {
+ NSSHA1_Update(context, (uint8_t *)"\0", 1);
+ }
+ NSSHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
+ for (i = 0; i < NSSHA1_DIGEST_SIZE; i++) {
+ digest[i] = (uint8_t)
+ ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+ }
+
+ free(context);
+
+ return NSERROR_OK;
+}
+
+nserror
+NSSHA1(const uint8_t *data, const size_t len, uint8_t digest[NSSHA1_DIGEST_SIZE])
+{
+ struct nssha1_ctx *context;
+ nserror error;
+
+ error = NSSHA1_Init(&context);
+ if (error != NSERROR_OK)
+ return error;
+ NSSHA1_Update(context, data, len);
+ NSSHA1_Final(context, digest);
+
+ return NSERROR_OK;
+}
diff --git a/utils/sha1.h b/utils/sha1.h
new file mode 100644
index 0000000..e9f930c
--- /dev/null
+++ b/utils/sha1.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * interface for steve reid's public domain SHA-1 implementation.
+ *
+ * The exposed API makes only minimal changes to the public domain
+ * implementation, mainly adding a prefix so this implementation is
+ * not confused with any other similarly named version that might be
+ * linked.
+ */
+
+#ifndef _NETSURF_UTILS_SHA1_H_
+#define _NETSURF_UTILS_SHA1_H_
+
+struct nssha1_ctx;
+
+#define NSSHA1_DIGEST_SIZE 20
+
+/**
+ * Initialise a SHA1 context ready to take updates
+ *
+ * The context is allocated by this routine and destroyed by the finaliser.
+ *
+ * @param context receives an initialised SHA1 context.
+ * @return NSERROR_OK and \a context updated on sucess or
+ * NSERROR_NOMEM on memory exhaustion.
+ */
+nserror NSSHA1_Init(struct nssha1_ctx **context);
+
+/**
+ * Update an SHA1 context with additional data.
+ *
+ * @param context The context created by NSSHA1_Init
+ * @param data The data to hash.
+ * @param len The length of data to hash.
+ * @return NSERROR_OK
+ */
+nserror NSSHA1_Update(struct nssha1_ctx *context, const uint8_t *data, const size_t len);
+
+/**
+ * Finalise a SHA1 hash.
+ *
+ * Frees the context.
+ *
+ * @param context The context created by NSSHA1_Init
+ * @param digest a buffer to store the results in.
+ * @return NSERROR_OK
+ */
+nserror NSSHA1_Final(struct nssha1_ctx *context, uint8_t digest[NSSHA1_DIGEST_SIZE]);
+
+/**
+ * Generate SHA1 of some data
+ */
+nserror NSSHA1(const uint8_t *data, const size_t len, uint8_t digest[NSSHA1_DIGEST_SIZE]);
+
+#endif
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf-website: branch master updated. a43162d86e5a3e9b99385cf00ba98f533fee0973
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/a43162d86e5a3...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/a43162d86e5a3e9...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/a43162d86e5a3e9b9...
The branch, master has been updated
via a43162d86e5a3e9b99385cf00ba98f533fee0973 (commit)
from ea4be081681ae32334806aeb39f4e2236e89fde0 (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-website.git/commit/?id=a43162d86e5...
commit a43162d86e5a3e9b99385cf00ba98f533fee0973
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
List libs alphabetically. Link to the dom html element files that are mentioned.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index e8f1278..85f3d02 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -93,16 +93,16 @@
<p>This is a project to improve and add features to the <a href="http://www.netsurf-browser.org/">NetSurf project</a>'s core web-technology libraries. These libraries are MIT licenced and are available to, and used by, other projects. The libraries in question are:
</p>
<ul>
-<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
<li><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a> – CSS Parser and Selection Engine</li>
<li><a href="http://www.netsurf-browser.org/projects/libdom/">LibDOM</a> – Document Object Model library</li>
+<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
</ul>
<h3>Project Outline</h3>
<h4>Phase 1</h4>
<ul>
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_button_eleme...">html_button_element.c</a> have implementations, while most like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_anchor_eleme...">html_anchor_element.c</a> do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
@@ -110,7 +110,7 @@
<p>Either one of the following:</p>
<ul>
<li>
-<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
+<p>Bring Hubbub up to latest HTML5 parsing spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
</li>
<li>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index e8f1278..85f3d02 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -93,16 +93,16 @@
<p>This is a project to improve and add features to the <a href="http://www.netsurf-browser.org/">NetSurf project</a>'s core web-technology libraries. These libraries are MIT licenced and are available to, and used by, other projects. The libraries in question are:
</p>
<ul>
-<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
<li><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a> – CSS Parser and Selection Engine</li>
<li><a href="http://www.netsurf-browser.org/projects/libdom/">LibDOM</a> – Document Object Model library</li>
+<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
</ul>
<h3>Project Outline</h3>
<h4>Phase 1</h4>
<ul>
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_button_eleme...">html_button_element.c</a> have implementations, while most like <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html/html_anchor_eleme...">html_anchor_element.c</a> do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
@@ -110,7 +110,7 @@
<p>Either one of the following:</p>
<ul>
<li>
-<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
+<p>Bring Hubbub up to latest HTML5 parsing spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
</li>
<li>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf-website: branch master updated. ea4be081681ae32334806aeb39f4e2236e89fde0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/ea4be081681ae...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/ea4be081681ae32...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/ea4be081681ae3233...
The branch, master has been updated
via ea4be081681ae32334806aeb39f4e2236e89fde0 (commit)
from cda98c449d28526a74a02b5cc4d5416005b8b14a (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-website.git/commit/?id=ea4be081681...
commit ea4be081681ae32334806aeb39f4e2236e89fde0
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add mentor listing. Fix typo.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 1c463ac..e8f1278 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -102,7 +102,7 @@
<ul>
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
@@ -121,6 +121,18 @@
<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
+<h2>Mentors</h2>
+
+<p>For mentors we have five of NetSurf's <a href="/about/team">core developers</a>:</p>
+
+<ul>
+<li>John-Mark Bell</li>
+<li>Michael Drake</li>
+<li>Rob Kendrick</li>
+<li>Vincent Sanders</li>
+<li>Daniel Silverstone</li>
+</ul>
+
<div class="footer">
<p>Copyright 2003 - 2014 The NetSurf Developers</p>
</div>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 1c463ac..e8f1278 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -102,7 +102,7 @@
<ul>
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
-<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>Implement remaining LibDOM html element specialisations. Some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
@@ -121,6 +121,18 @@
<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
+<h2>Mentors</h2>
+
+<p>For mentors we have five of NetSurf's <a href="/about/team">core developers</a>:</p>
+
+<ul>
+<li>John-Mark Bell</li>
+<li>Michael Drake</li>
+<li>Rob Kendrick</li>
+<li>Vincent Sanders</li>
+<li>Daniel Silverstone</li>
+</ul>
+
<div class="footer">
<p>Copyright 2003 - 2014 The NetSurf Developers</p>
</div>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf-website: branch master updated. cda98c449d28526a74a02b5cc4d5416005b8b14a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/cda98c449d285...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/cda98c449d28526...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/cda98c449d28526a7...
The branch, master has been updated
via cda98c449d28526a74a02b5cc4d5416005b8b14a (commit)
from 47578d05bcb96906bcb9c1759c27663a8b09ecef (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-website.git/commit/?id=cda98c449d2...
commit cda98c449d28526a74a02b5cc4d5416005b8b14a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add dom spec link.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index c1b7822..1c463ac 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -103,7 +103,7 @@
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
-<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
<h4>Phase 2</h4>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index c1b7822..1c463ac 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -103,7 +103,7 @@
<li>
<p>This should be fairly easy, although perhaps time consuming.</p>
<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
-<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a>, <a href="http://dom.spec.whatwg.org/">DOM Standard</a></p>
</li>
</ul>
<h4>Phase 2</h4>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf-website: branch master updated. 47578d05bcb96906bcb9c1759c27663a8b09ecef
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/47578d05bcb96...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/47578d05bcb9690...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/47578d05bcb96906b...
The branch, master has been updated
via 47578d05bcb96906bcb9c1759c27663a8b09ecef (commit)
from 63f1d9d0d976eed0a549c1ea56202f0f6ad02ded (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-website.git/commit/?id=47578d05bcb...
commit 47578d05bcb96906bcb9c1759c27663a8b09ecef
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix typos.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 3ffedcb..c1b7822 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -101,8 +101,8 @@
<h4>Phase 1</h4>
<ul>
<li>
-<p>This should be fiarly easy, although perhaps time consuming.</p>
-<p>Implement reamining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>This should be fairly easy, although perhaps time consuming.</p>
+<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
</li>
</ul>
@@ -110,7 +110,7 @@
<p>Either one of the following:</p>
<ul>
<li>
-<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implemenation where appropriate.</p>
+<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
</li>
<li>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
index 3ffedcb..c1b7822 100644
--- a/developers/gsoc/2014ideas.en
+++ b/developers/gsoc/2014ideas.en
@@ -101,8 +101,8 @@
<h4>Phase 1</h4>
<ul>
<li>
-<p>This should be fiarly easy, although perhaps time consuming.</p>
-<p>Implement reamining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p>This should be fairly easy, although perhaps time consuming.</p>
+<p>Implement remaining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
</li>
</ul>
@@ -110,7 +110,7 @@
<p>Either one of the following:</p>
<ul>
<li>
-<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implemenation where appropriate.</p>
+<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implementation where appropriate.</p>
<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
</li>
<li>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf-website: branch master updated. 63f1d9d0d976eed0a549c1ea56202f0f6ad02ded
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/63f1d9d0d976e...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/63f1d9d0d976eed...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/63f1d9d0d976eed0a...
The branch, master has been updated
via 63f1d9d0d976eed0a549c1ea56202f0f6ad02ded (commit)
from f70cd96fc8b7baaaccd4c2afb3d6ea92013c27b3 (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-website.git/commit/?id=63f1d9d0d97...
commit 63f1d9d0d976eed0a549c1ea56202f0f6ad02ded
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add 2014 ideas.
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
new file mode 100644
index 0000000..3ffedcb
--- /dev/null
+++ b/developers/gsoc/2014ideas.en
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>NetSurf | Google Summer of Code 2014 Ideas</title>
+<link rel="stylesheet" title="Standard" type="text/css" href="/netsurf.css">
+</head>
+
+<body>
+<p class="banner"><a href="/"><img src="/netsurf.png" alt="NetSurf"></a></p>
+
+<div class="navigation">
+<div class="navsection">
+<ul>
+<li><a href="/about/">About NetSurf</a></li>
+<li><a href="/downloads/">Downloads</a></li>
+<li><a href="/documentation/">Documentation</a></li>
+<li><a href="/developers/">Development area</a>
+<ul>
+<li><a href="/developers/contribute">Contribution</a></li>
+<li><a href="/developers/gsoc">GSoC</a></li>
+</ul>
+</li>
+<li><a href="/webmasters/">Webmaster area</a></li>
+<li><a href="/contact/">Contact</a></li>
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="languages">
+<!--<li><a href="index.de">Deutsch</a></li>-->
+<li>English</li>
+<!--<li><a href="index.fr">Fran�ais</a></li>-->
+<!--<li><a href="index.nl">Nederlands</a></li>-->
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="sitelinks">
+<li><a href="http://wiki.netsurf-browser.org/">Development wiki</a></li>
+<li><a href="http://source.netsurf-browser.org/">Git repository viewer</a></li>
+<li><a href="http://ci.netsurf-browser.org/">Continuous Integration</a></li>
+<li><a href="http://bugs.netsurf-browser.org/">Bug report system</a></li>
+</ul>
+</div>
+
+</div>
+
+<div class="content">
+
+<p class="breadcrumbs"><a href="/">Home</a> � <a href="/developers/">Developer area</a> � Google Summer of Code</p>
+
+<h1>Google Summer of Code Ideas</h1>
+
+<p>This page lists our project ideas for <strong><a href="http://code.google.com/soc/">Google Summer of Code 2014</a></strong>.</p>
+
+<dl>
+<dt>Before applying for a project<dt>
+<dd>
+<ul>
+<li>Join our IRC channel <code>#netsurf</code> on <a href="http://freenode.net/">Freenode</a> and introduce yourself. Also, subscribe to the <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</li>
+<li>Get up to speed with <a href="http://wiki.netsurf-browser.org/Documentation/GettingCoding">Git</a>, as we use this for source control, and get the NetSurf <a href="http://www.netsurf-browser.org/documentation/develop#SourceControl">source code</a>.</li>
+<li><a href="http://www.netsurf-browser.org/documentation/develop#Compiling">Build NetSurf</a> and enjoy using it. (Ask on IRC if you need help.)</li>
+<li>Get familiarised with the source code – read the <a href="http://source.netsurf-browser.org/netsurf.git/tree/Docs">code documentation</a>.</li>
+<li>Consider submitting a patch to fix an issue on our <a href="http://bugs.netsurf-browser.org/">bug tracker</a>.</li>
+</ul>
+<dd>
+<dt>When applying for a project<dt>
+<dd>
+<ul>
+<li>Tell us about yourself, your experience, and why you want to work with us.</li>
+<li>Describe the project you want to do, and how you plan to go about doing it. <strong>Do not simply copy the project description from the ideas page.</strong></li>
+<li>Create a set of project milestones (ranging from a couple to maximum 10) with expected completion dates. This will be useful for you as guidance and for us to set our expectations right.</li>
+<li>Describe how you will test your contributions.</li>
+<li>Include your IRC nick in your application if you've spoken with us on <code>#netsurf</code>, so that we recognise you. <strong>We strongly recommend that you communicate with us before submitting an application.</strong></li>
+<li>We expect GSoC to be mostly equivalent to a full-time job. Therefore, please tell us if you have any other demands on your time.</li>
+</ul>
+<dd>
+<dt>During the project</dt>
+<dd>
+<ul>
+<li>Most of NetSurf team communication happens via #netsurf IRC during evenings and nights (<a href="http://en.wikipedia.org/wiki/Central_European_Time">CET</a>). We expect you to join in on a regular basis for help, discussions and project updates. Note that you're not restricted to speaking to your assigned mentor; the whole development team are willing to help wherever they can.</li>
+<li>Keep NetSurf's <a href="http://www.netsurf-browser.org/about/#ProjectGoals">project goals</a> in mind, especially the first point.</li>
+</ul>
+</dd>
+</dl>
+
+<p>There is some more information in the <a href="http://wiki.netsurf-browser.org/google-summer-of-code">GSoC section</a> of our wiki. Note particularly the <a href="http://wiki.netsurf-browser.org/gsoc-student-guidelines">student guidelines</a>.</p>
+
+<p>Please <a href="/contact/">get in touch</a> our project idea appeals to you or if you have your own idea for either <a href="/">NetSurf</a> or one of NetSurf's <a href="/projects/">libraries</a>. Come and chat to the developers in the NetSurf IRC channel or post to the developer mailing list.</p>
+
+<h2>Update Core Web Technology Libraries</h2>
+<p>This is a project to improve and add features to the <a href="http://www.netsurf-browser.org/">NetSurf project</a>'s core web-technology libraries. These libraries are MIT licenced and are available to, and used by, other projects. The libraries in question are:
+</p>
+<ul>
+<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
+<li><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a> – CSS Parser and Selection Engine</li>
+<li><a href="http://www.netsurf-browser.org/projects/libdom/">LibDOM</a> – Document Object Model library</li>
+</ul>
+<h3>Project Outline</h3>
+<h4>Phase 1</h4>
+<ul>
+<li>
+<p>This should be fiarly easy, although perhaps time consuming.</p>
+<p>Implement reamining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
+</li>
+</ul>
+<h4>Phase 2</h4>
+<p>Either one of the following:</p>
+<ul>
+<li>
+<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implemenation where appropriate.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
+</li>
+<li>
+<p>Add CSS3 properties to LibCSS. There many CSS3 properties that are now in widespread use. Support for these can be added to LibCSS.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libcss.git/tree/src">libcss/src</a><br><strong>Specification:</strong> <a href="http://www.w3.org/Style/CSS/specs.en.html">CSS Specs</a></p>
+</li>
+</ul>
+<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
+<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
+
+<div class="footer">
+<p>Copyright 2003 - 2014 The NetSurf Developers</p>
+</div>
+
+</div>
+
+
+<form method="get" action="http://www.google.co.uk/search">
+<div class="searchbox">
+<input type="hidden" name="q" value="site:netsurf-browser.org">
+<input type="text" name="q" maxlength="255"><br>
+<input type="submit" value="Search" name="btnG">
+</div>
+</form>
+
+</body>
+</html>
diff --git a/developers/gsoc/index.en b/developers/gsoc/index.en
index e49610d..d5e8b56 100644
--- a/developers/gsoc/index.en
+++ b/developers/gsoc/index.en
@@ -52,6 +52,10 @@
<h1>Google Summer of Code</h1>
+<p>Our previous involvement with Google Summenr of Code is summarised here.</p>
+
+<h2>Google Summer of Code 2009</h2>
+
<p>The NetSurf project was selected to participate in <a href="http://code.google.com/soc/"> Google Summer of Code 2009</a> as a mentoring organisation. This year we are mentoring three students.</p>
<dl class="gsocstudents">
@@ -81,9 +85,7 @@
</dd>
</dl>
-<!--p>Our students are blogging their progress this summer. You can follow their activities on <a href="http://planet.netsurf-browser.org/">Planet NetSurf</a>.</p-->
-
-<p>Our <a href="2009ideas">project ideas</a> page for Google Summer of Code is still available.</p>
+<p>Our <a href="2009ideas">project ideas</a> page for Google Summer of Code 2009 is still available.</p>
<p>We ask students to keep NetSurf's <a href="http://www.netsurf-browser.org/about/#ProjectGoals">project goals</a> in mind, especially the first point. We also ask them to communicate with the developers as much as possible. More information for students is available on the <a href="http://wiki.netsurf-browser.org/">development wiki</a>.</p>
-----------------------------------------------------------------------
Summary of changes:
developers/gsoc/2014ideas.en | 140 ++++++++++++++++++++++++++++++++++++++++++
developers/gsoc/index.en | 8 ++-
2 files changed, 145 insertions(+), 3 deletions(-)
create mode 100644 developers/gsoc/2014ideas.en
diff --git a/developers/gsoc/2014ideas.en b/developers/gsoc/2014ideas.en
new file mode 100644
index 0000000..3ffedcb
--- /dev/null
+++ b/developers/gsoc/2014ideas.en
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>NetSurf | Google Summer of Code 2014 Ideas</title>
+<link rel="stylesheet" title="Standard" type="text/css" href="/netsurf.css">
+</head>
+
+<body>
+<p class="banner"><a href="/"><img src="/netsurf.png" alt="NetSurf"></a></p>
+
+<div class="navigation">
+<div class="navsection">
+<ul>
+<li><a href="/about/">About NetSurf</a></li>
+<li><a href="/downloads/">Downloads</a></li>
+<li><a href="/documentation/">Documentation</a></li>
+<li><a href="/developers/">Development area</a>
+<ul>
+<li><a href="/developers/contribute">Contribution</a></li>
+<li><a href="/developers/gsoc">GSoC</a></li>
+</ul>
+</li>
+<li><a href="/webmasters/">Webmaster area</a></li>
+<li><a href="/contact/">Contact</a></li>
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="languages">
+<!--<li><a href="index.de">Deutsch</a></li>-->
+<li>English</li>
+<!--<li><a href="index.fr">Fran�ais</a></li>-->
+<!--<li><a href="index.nl">Nederlands</a></li>-->
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="sitelinks">
+<li><a href="http://wiki.netsurf-browser.org/">Development wiki</a></li>
+<li><a href="http://source.netsurf-browser.org/">Git repository viewer</a></li>
+<li><a href="http://ci.netsurf-browser.org/">Continuous Integration</a></li>
+<li><a href="http://bugs.netsurf-browser.org/">Bug report system</a></li>
+</ul>
+</div>
+
+</div>
+
+<div class="content">
+
+<p class="breadcrumbs"><a href="/">Home</a> � <a href="/developers/">Developer area</a> � Google Summer of Code</p>
+
+<h1>Google Summer of Code Ideas</h1>
+
+<p>This page lists our project ideas for <strong><a href="http://code.google.com/soc/">Google Summer of Code 2014</a></strong>.</p>
+
+<dl>
+<dt>Before applying for a project<dt>
+<dd>
+<ul>
+<li>Join our IRC channel <code>#netsurf</code> on <a href="http://freenode.net/">Freenode</a> and introduce yourself. Also, subscribe to the <a href="http://www.netsurf-browser.org/lists/netsurf-dev">developer mailing list</a>.</li>
+<li>Get up to speed with <a href="http://wiki.netsurf-browser.org/Documentation/GettingCoding">Git</a>, as we use this for source control, and get the NetSurf <a href="http://www.netsurf-browser.org/documentation/develop#SourceControl">source code</a>.</li>
+<li><a href="http://www.netsurf-browser.org/documentation/develop#Compiling">Build NetSurf</a> and enjoy using it. (Ask on IRC if you need help.)</li>
+<li>Get familiarised with the source code – read the <a href="http://source.netsurf-browser.org/netsurf.git/tree/Docs">code documentation</a>.</li>
+<li>Consider submitting a patch to fix an issue on our <a href="http://bugs.netsurf-browser.org/">bug tracker</a>.</li>
+</ul>
+<dd>
+<dt>When applying for a project<dt>
+<dd>
+<ul>
+<li>Tell us about yourself, your experience, and why you want to work with us.</li>
+<li>Describe the project you want to do, and how you plan to go about doing it. <strong>Do not simply copy the project description from the ideas page.</strong></li>
+<li>Create a set of project milestones (ranging from a couple to maximum 10) with expected completion dates. This will be useful for you as guidance and for us to set our expectations right.</li>
+<li>Describe how you will test your contributions.</li>
+<li>Include your IRC nick in your application if you've spoken with us on <code>#netsurf</code>, so that we recognise you. <strong>We strongly recommend that you communicate with us before submitting an application.</strong></li>
+<li>We expect GSoC to be mostly equivalent to a full-time job. Therefore, please tell us if you have any other demands on your time.</li>
+</ul>
+<dd>
+<dt>During the project</dt>
+<dd>
+<ul>
+<li>Most of NetSurf team communication happens via #netsurf IRC during evenings and nights (<a href="http://en.wikipedia.org/wiki/Central_European_Time">CET</a>). We expect you to join in on a regular basis for help, discussions and project updates. Note that you're not restricted to speaking to your assigned mentor; the whole development team are willing to help wherever they can.</li>
+<li>Keep NetSurf's <a href="http://www.netsurf-browser.org/about/#ProjectGoals">project goals</a> in mind, especially the first point.</li>
+</ul>
+</dd>
+</dl>
+
+<p>There is some more information in the <a href="http://wiki.netsurf-browser.org/google-summer-of-code">GSoC section</a> of our wiki. Note particularly the <a href="http://wiki.netsurf-browser.org/gsoc-student-guidelines">student guidelines</a>.</p>
+
+<p>Please <a href="/contact/">get in touch</a> our project idea appeals to you or if you have your own idea for either <a href="/">NetSurf</a> or one of NetSurf's <a href="/projects/">libraries</a>. Come and chat to the developers in the NetSurf IRC channel or post to the developer mailing list.</p>
+
+<h2>Update Core Web Technology Libraries</h2>
+<p>This is a project to improve and add features to the <a href="http://www.netsurf-browser.org/">NetSurf project</a>'s core web-technology libraries. These libraries are MIT licenced and are available to, and used by, other projects. The libraries in question are:
+</p>
+<ul>
+<li><a href="http://www.netsurf-browser.org/projects/hubbub/">LibHubbub</a> – HTML5 Parsing library</li>
+<li><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a> – CSS Parser and Selection Engine</li>
+<li><a href="http://www.netsurf-browser.org/projects/libdom/">LibDOM</a> – Document Object Model library</li>
+</ul>
+<h3>Project Outline</h3>
+<h4>Phase 1</h4>
+<ul>
+<li>
+<p>This should be fiarly easy, although perhaps time consuming.</p>
+<p>Implement reamining LibDOM html element specialisations. The some element specialisations, like html_button_element.c have implementations, while most like html_anchor_element.c do not.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libdom.git/tree/src/html">libdom/src/html</a>.<br><strong>Specification:</strong> <a href="http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definitions.html">Level 2 Document Object Model HTML</a></p>
+</li>
+</ul>
+<h4>Phase 2</h4>
+<p>Either one of the following:</p>
+<ul>
+<li>
+<p>Bring Hubbub up to latest HTML5 spec. This involves comparing the current implementation with the specification and updating our implemenation where appropriate.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libhubbub.git/tree/">libhubbub/src</a><br><strong>Specification:</strong> <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html">HTML5 Parsing</a></p>
+</li>
+<li>
+<p>Add CSS3 properties to LibCSS. There many CSS3 properties that are now in widespread use. Support for these can be added to LibCSS.</p>
+<p><strong>Existing code:</strong> <a href="http://git.netsurf-browser.org/libcss.git/tree/src">libcss/src</a><br><strong>Specification:</strong> <a href="http://www.w3.org/Style/CSS/specs.en.html">CSS Specs</a></p>
+</li>
+</ul>
+<p>The decision on Phase 2 will be made by the student and mentors, depending on the interests of the student, ability shown in Phase 1, and time remaining. It is not anticipated that there will be time for a student to do both items of Phase 2, however the work is there if a gifted student makes good progress.</p>
+<p><strong>Skills required:</strong> Experience of the C programming language<br><strong>Skills desirable:</strong> HTML, DOM, CSS
+
+<div class="footer">
+<p>Copyright 2003 - 2014 The NetSurf Developers</p>
+</div>
+
+</div>
+
+
+<form method="get" action="http://www.google.co.uk/search">
+<div class="searchbox">
+<input type="hidden" name="q" value="site:netsurf-browser.org">
+<input type="text" name="q" maxlength="255"><br>
+<input type="submit" value="Search" name="btnG">
+</div>
+</form>
+
+</body>
+</html>
diff --git a/developers/gsoc/index.en b/developers/gsoc/index.en
index e49610d..d5e8b56 100644
--- a/developers/gsoc/index.en
+++ b/developers/gsoc/index.en
@@ -52,6 +52,10 @@
<h1>Google Summer of Code</h1>
+<p>Our previous involvement with Google Summenr of Code is summarised here.</p>
+
+<h2>Google Summer of Code 2009</h2>
+
<p>The NetSurf project was selected to participate in <a href="http://code.google.com/soc/"> Google Summer of Code 2009</a> as a mentoring organisation. This year we are mentoring three students.</p>
<dl class="gsocstudents">
@@ -81,9 +85,7 @@
</dd>
</dl>
-<!--p>Our students are blogging their progress this summer. You can follow their activities on <a href="http://planet.netsurf-browser.org/">Planet NetSurf</a>.</p-->
-
-<p>Our <a href="2009ideas">project ideas</a> page for Google Summer of Code is still available.</p>
+<p>Our <a href="2009ideas">project ideas</a> page for Google Summer of Code 2009 is still available.</p>
<p>We ask students to keep NetSurf's <a href="http://www.netsurf-browser.org/about/#ProjectGoals">project goals</a> in mind, especially the first point. We also ask them to communicate with the developers as much as possible. More information for students is available on the <a href="http://wiki.netsurf-browser.org/">development wiki</a>.</p>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month
- 1
- 0
netsurf: branch vince/disccache updated. release/3.0-1116-gc940d69
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c940d69028064b5a3ffa3...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c940d69028064b5a3ffa38d...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c940d69028064b5a3ffa38dfd...
The branch, vince/disccache has been updated
via c940d69028064b5a3ffa38dfd67302ada9eaaaa2 (commit)
via a96db42291cd6cbc806aa20fc063151e8475d5a6 (commit)
via 839c50a0d012d093d97db5ae28b9d9a114f8404c (commit)
from 45c3adba5a683a744329c564448140252e1b48d7 (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=c940d69028064b5a3ff...
commit c940d69028064b5a3ffa38dfd67302ada9eaaaa2
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
attempt fetch from persistant storage for new objects before fetching from network
diff --git a/content/llcache.c b/content/llcache.c
index 79650b1..87e1692 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -1035,6 +1035,50 @@ llcache_persist_retrieve(llcache_object *object)
&object->source_len);
}
+static nserror
+llcache_object_persist_fetch(llcache_object *object,
+ uint32_t flags,
+ nsurl *referer,
+ const llcache_post_data *post,
+ uint32_t redirect_count)
+{
+ nserror error;
+ nsurl *referer_clone = NULL;
+ llcache_post_data *post_clone = NULL;
+
+ /* attempt to retrieve object from the cache */
+ error = guit->llcache->retrieve(object->url,
+ &object->cache,
+ &object->source_data,
+ &object->source_len);
+ if (error != NSERROR_OK)
+ return error;
+
+ /* entry came out of cache - need to setup object state */
+ if (post != NULL) {
+ error = llcache_post_data_clone(post, &post_clone);
+ if (error != NSERROR_OK)
+ return error;
+ }
+
+ if (referer != NULL)
+ referer_clone = nsurl_ref(referer);
+
+ object->fetch.flags = flags;
+ object->fetch.referer = referer_clone;
+ object->fetch.post = post_clone;
+ object->fetch.redirect_count = redirect_count;
+
+ /* fetch is "finished" */
+ object->fetch.state = LLCACHE_FETCH_COMPLETE;
+ object->fetch.fetch = NULL;
+
+ object->store_state = LLCACHE_STORE_DISC;
+ object->source_alloc = object->source_len;
+
+ return NSERROR_OK;
+}
+
/**
* Retrieve a potentially cached object
*
@@ -1059,7 +1103,7 @@ llcache_object_retrieve_from_cache(nsurl *url,
#ifdef LLCACHE_TRACE
LOG(("Searching cache for %s (%x %s %p)",
- nsurl_access(url), flags, nsurl_access(referer), post));
+ nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
/* Search for the most recently fetched matching object */
@@ -1161,24 +1205,28 @@ llcache_object_retrieve_from_cache(nsurl *url,
llcache_object_remove_from_list(newest,
&llcache->cached_objects);
llcache_object_destroy(newest);
+ } else {
+#ifdef LLCACHE_TRACE
+ LOG(("Not found"));
+#endif
}
/* No viable object found in cache; create a new object */
-
error = llcache_object_new(url, &obj);
if (error != NSERROR_OK)
return error;
-#ifdef LLCACHE_TRACE
- LOG(("Not found %p", obj));
-#endif
-
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags, referer, post,
- redirect_count);
+ /* attempt to "fetch" object from persistant store first */
+ error = llcache_object_persist_fetch(obj, flags, referer, post,
+ redirect_count);
if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
+ /* Attempt to kick-off fetch */
+ error = llcache_object_fetch(obj, flags, referer, post,
+ redirect_count);
+ if (error != NSERROR_OK) {
+ llcache_object_destroy(obj);
+ return error;
+ }
}
/* Add new object to cache */
@@ -1210,7 +1258,7 @@ static nserror llcache_object_retrieve(nsurl *url, uint32_t flags,
nsurl *defragmented_url;
#ifdef LLCACHE_TRACE
- LOG(("Retrieve %s (%x, %s, %p)", url, flags, referer, post));
+ LOG(("Retrieve %s (%x, %s, %p)", nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
/**
diff --git a/gtk/llcache.c b/gtk/llcache.c
index 3587c0d..e6bf7aa 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -16,6 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/** \file
+ * Low-level resource cache persistant storage implementation.
+ */
+
#include "utils/nsurl.h"
#include "utils/log.h"
#include "desktop/gui.h"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a96db42291cd6cbc806...
commit a96db42291cd6cbc806aa20fc063151e8475d5a6
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
improve frontend operation interface
diff --git a/content/llcache.c b/content/llcache.c
index 7aa02ab..79650b1 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -34,7 +34,7 @@
#include "desktop/gui_factory.h"
#include "content/fetch.h"
-#include "content/llcache.h"
+#include "content/llcache_private.h"
#include "content/urldb.h"
/** Define to enable tracing of llcache operations. */
@@ -93,27 +93,6 @@ typedef struct {
bool outstanding_query; /**< Waiting for a query response */
} llcache_fetch_ctx;
-typedef enum {
- LLCACHE_VALIDATE_FRESH, /**< Only revalidate if not fresh */
- LLCACHE_VALIDATE_ALWAYS, /**< Always revalidate */
- LLCACHE_VALIDATE_ONCE /**< Revalidate once only */
-} llcache_validate;
-
-/** Cache control data */
-typedef struct {
- time_t req_time; /**< Time of request */
- time_t res_time; /**< Time of response */
- time_t fin_time; /**< Time of request completion */
- time_t date; /**< Date: response header */
- time_t expires; /**< Expires: response header */
-#define INVALID_AGE -1
- int age; /**< Age: response header */
- int max_age; /**< Max-Age Cache-control parameter */
- llcache_validate no_cache; /**< No-Cache Cache-control parameter */
- char *etag; /**< Etag: response header */
- time_t last_modified; /**< Last-Modified: response header */
-} llcache_cache_control;
-
/** Representation of a fetch header */
typedef struct {
char *name; /**< Header name */
@@ -1051,7 +1030,7 @@ llcache_persist_retrieve(llcache_object *object)
/* Source data for the object may be in the persiatant store */
return guit->llcache->retrieve(object->url,
- NULL,
+ &object->cache,
&object->source_data,
&object->source_len);
}
@@ -1781,7 +1760,7 @@ static void llcache_persist(void *p)
(remaining_lifetime > LLCACHE_MIN_DISC_LIFETIME)) {
/* ok found an object to write */
ret = guit->llcache->persist(object->url,
- remaining_lifetime,
+ &object->cache,
object->source_data,
object->source_len);
if (ret != NSERROR_OK) {
diff --git a/content/llcache.h b/content/llcache.h
index 1faba81..3d8232c 100644
--- a/content/llcache.h
+++ b/content/llcache.h
@@ -131,12 +131,6 @@ typedef struct {
} data;
} llcache_query;
-/** operation table */
-struct gui_llcache_table {
- nserror (*persist)(struct nsurl *url, int remaining, const uint8_t *data, const size_t datalen);
- nserror (*retrieve)(struct nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out);
-};
-
/**
* Response handler for fetch-related queries
*
diff --git a/content/llcache_private.h b/content/llcache_private.h
new file mode 100644
index 0000000..926773b
--- /dev/null
+++ b/content/llcache_private.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Low-level resource cache private interface
+ */
+
+#ifndef NETSURF_CONTENT_LLCACHE_PRIVATE_H_
+#define NETSURF_CONTENT_LLCACHE_PRIVATE_H_
+
+#include "content/llcache.h"
+
+/** validation control */
+typedef enum {
+ LLCACHE_VALIDATE_FRESH, /**< Only revalidate if not fresh */
+ LLCACHE_VALIDATE_ALWAYS, /**< Always revalidate */
+ LLCACHE_VALIDATE_ONCE /**< Revalidate once only */
+} llcache_validate;
+
+/** cache control value for invalid age */
+#define INVALID_AGE -1
+
+/** Cache control data */
+typedef struct {
+ time_t req_time; /**< Time of request */
+ time_t res_time; /**< Time of response */
+ time_t fin_time; /**< Time of request completion */
+ time_t date; /**< Date: response header */
+ time_t expires; /**< Expires: response header */
+ int age; /**< Age: response header */
+ int max_age; /**< Max-Age Cache-control parameter */
+ llcache_validate no_cache; /**< No-Cache Cache-control parameter */
+ char *etag; /**< Etag: response header */
+ time_t last_modified; /**< Last-Modified: response header */
+} llcache_cache_control;
+
+/** operation table */
+struct gui_llcache_table {
+ nserror (*persist)(struct nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen);
+ nserror (*retrieve)(struct nsurl *url, llcache_cache_control *cache_control, uint8_t **data, size_t *datalen);
+};
+
+#endif
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index e7d2994..37fee39 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -17,6 +17,8 @@
*/
#include "content/hlcache.h"
+#include "content/llcache_private.h"
+
#include "desktop/download.h"
#include "desktop/gui_factory.h"
@@ -343,12 +345,12 @@ static nserror verify_utf8_register(struct gui_utf8_table *gut)
return NSERROR_OK;
}
-static nserror gui_default_persist(nsurl *url, int remaining, const uint8_t *data, const size_t datalen)
+static nserror gui_default_persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
return NSERROR_SAVE_FAILED;
}
-static nserror gui_default_retrieve(nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out)
+static nserror gui_default_retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
{
return NSERROR_NOT_FOUND;
}
diff --git a/gtk/llcache.c b/gtk/llcache.c
index ef00641..3587c0d 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -19,19 +19,19 @@
#include "utils/nsurl.h"
#include "utils/log.h"
#include "desktop/gui.h"
-#include "content/llcache.h"
+#include "content/llcache_private.h"
#include "gtk/llcache.h"
static nserror
-persist(nsurl *url, int remaining, const uint8_t *data, const size_t datalen)
+persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
LOG(("Writing cache file for url:%s", nsurl_access(url)));
return NSERROR_OK;
}
static nserror
-retrieve(nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out)
+retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
{
return NSERROR_NOT_FOUND;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=839c50a0d012d093d97...
commit 839c50a0d012d093d97db5ae28b9d9a114f8404c
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
may teh object retrival from persistant storage much more obvious
diff --git a/content/llcache.c b/content/llcache.c
index 49a8ccd..7aa02ab 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -1028,6 +1028,35 @@ static nserror llcache_object_remove_from_list(llcache_object *object,
}
/**
+ * Retrieve source data for an object from persistant store if necessary.
+ *
+ * If an objects source data has been placed in the persistant store
+ * and the in memory copy freed this will attempt to retrive the
+ * source data.
+ *
+ * @param object the object to operate on.
+ *
+ */
+static nserror
+llcache_persist_retrieve(llcache_object *object)
+{
+ /* ensure the source data is present if necessary */
+ if ((object->source_data != NULL) ||
+ (object->store_state != LLCACHE_STORE_DISC)) {
+ /* source data does not require retriving from
+ * persistant store.
+ */
+ return NSERROR_OK;
+ }
+
+ /* Source data for the object may be in the persiatant store */
+ return guit->llcache->retrieve(object->url,
+ NULL,
+ &object->source_data,
+ &object->source_len);
+}
+
+/**
* Retrieve a potentially cached object
*
* \param url URL of object to retrieve
@@ -1050,127 +1079,132 @@ llcache_object_retrieve_from_cache(nsurl *url,
llcache_object *obj, *newest = NULL;
#ifdef LLCACHE_TRACE
- LOG(("Searching cache for %s (%x %s %p)", url, flags, referer, post));
+ LOG(("Searching cache for %s (%x %s %p)",
+ nsurl_access(url), flags, nsurl_access(referer), post));
#endif
/* Search for the most recently fetched matching object */
for (obj = llcache->cached_objects; obj != NULL; obj = obj->next) {
if ((newest == NULL ||
- obj->cache.req_time > newest->cache.req_time) &&
- nsurl_compare(obj->url, url,
- NSURL_COMPLETE) == true) {
+ obj->cache.req_time > newest->cache.req_time) &&
+ nsurl_compare(obj->url, url,
+ NSURL_COMPLETE) == true) {
newest = obj;
}
}
- if (newest != NULL && llcache_object_is_fresh(newest)) {
- /* Found a suitable object, and it's still fresh, so use it */
- obj = newest;
+ if ((newest != NULL) && (llcache_object_is_fresh(newest))) {
+ /* Found a suitable object, and it's still fresh */
#ifdef LLCACHE_TRACE
- LOG(("Found fresh %p", obj));
+ LOG(("Found fresh %p", newest));
#endif
/* The client needs to catch up with the object's state.
* This will occur the next time that llcache_poll is called.
*/
- /* the objects source data may be in the persiatant store */
- if ((obj->store_state == LLCACHE_STORE_DISC) &&
- (obj->source_data == NULL)) {
- int remaining;
- error = guit->llcache->retrieve(obj->url,
- &remaining,
- &obj->source_data,
- &obj->source_len);
- if (error != NSERROR_OK) {
- /* persistant store failed, destroy
- * cache object and re-retch
- */
-#ifdef LLCACHE_TRACE
- LOG(("Persistant retrival failed for %p", obj));
-#endif
+ /* ensure the source data is present */
+ error = llcache_persist_retrieve(newest);
+ if (error == NSERROR_OK) {
+ /* source data was sucessfully retrived from
+ * persistant store
+ */
+ *result = newest;
- llcache_object_remove_from_list(obj,
- &llcache->cached_objects);
- llcache_object_destroy(obj);
+ return NSERROR_OK;
+ }
- /* Create new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* retrival of source data from persistant store
+ * failed, destroy cache object and fall though to
+ * cache miss to re-retch
+ */
+#ifdef LLCACHE_TRACE
+ LOG(("Persistant retrival failed for %p", newest));
+#endif
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags,
- referer, post,
- redirect_count);
- if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
- }
+ llcache_object_remove_from_list(newest, &llcache->cached_objects);
+ llcache_object_destroy(newest);
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
- }
- }
} else if (newest != NULL) {
/* Found a candidate object but it needs freshness validation */
- /* Create a new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* ensure the source data is present */
+ error = llcache_persist_retrieve(newest);
+ if (error == NSERROR_OK) {
+
+ /* Create a new object */
+ error = llcache_object_new(url, &obj);
+ if (error != NSERROR_OK)
+ return error;
#ifdef LLCACHE_TRACE
- LOG(("Found candidate %p (%p)", obj, newest));
+ LOG(("Found candidate %p (%p)", obj, newest));
#endif
- /* Clone candidate's cache data */
- error = llcache_object_clone_cache_data(newest, obj, true);
- if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
- }
+ /* Clone candidate's cache data */
+ error = llcache_object_clone_cache_data(newest, obj, true);
+ if (error != NSERROR_OK) {
+ llcache_object_destroy(obj);
+ return error;
+ }
- /* Record candidate, so we can fall back if it is still fresh */
- newest->candidate_count++;
- obj->candidate = newest;
+ /* Record candidate, so we can fall back if it is still fresh */
+ newest->candidate_count++;
+ obj->candidate = newest;
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags, referer, post,
- redirect_count);
- if (error != NSERROR_OK) {
- newest->candidate_count--;
- llcache_object_destroy(obj);
- return error;
- }
+ /* Attempt to kick-off fetch */
+ error = llcache_object_fetch(obj, flags, referer, post,
+ redirect_count);
+ if (error != NSERROR_OK) {
+ newest->candidate_count--;
+ llcache_object_destroy(obj);
+ return error;
+ }
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
- } else {
- /* No object found; create a new one */
- /* Create new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* Add new object to cache */
+ llcache_object_add_to_list(obj, &llcache->cached_objects);
+
+ *result = obj;
+
+ return NSERROR_OK;
+ }
+ /* retrival of source data from persistant store
+ * failed, destroy cache object and fall though to
+ * cache miss to re-retch
+ */
#ifdef LLCACHE_TRACE
- LOG(("Not found %p", obj));
+ LOG(("Persistant retrival failed for %p", newest));
#endif
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags, referer, post,
- redirect_count);
- if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
- }
+ llcache_object_remove_from_list(newest,
+ &llcache->cached_objects);
+ llcache_object_destroy(newest);
+ }
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
+ /* No viable object found in cache; create a new object */
+
+ error = llcache_object_new(url, &obj);
+ if (error != NSERROR_OK)
+ return error;
+
+#ifdef LLCACHE_TRACE
+ LOG(("Not found %p", obj));
+#endif
+
+ /* Attempt to kick-off fetch */
+ error = llcache_object_fetch(obj, flags, referer, post,
+ redirect_count);
+ if (error != NSERROR_OK) {
+ llcache_object_destroy(obj);
+ return error;
}
+ /* Add new object to cache */
+ llcache_object_add_to_list(obj, &llcache->cached_objects);
+
*result = obj;
return NSERROR_OK;
-----------------------------------------------------------------------
Summary of changes:
content/llcache.c | 261 ++++++++++++++++++++++++++++-----------------
content/llcache.h | 6 -
content/llcache_private.h | 58 ++++++++++
desktop/gui_factory.c | 6 +-
gtk/llcache.c | 10 ++-
5 files changed, 230 insertions(+), 111 deletions(-)
create mode 100644 content/llcache_private.h
diff --git a/content/llcache.c b/content/llcache.c
index 49a8ccd..87e1692 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -34,7 +34,7 @@
#include "desktop/gui_factory.h"
#include "content/fetch.h"
-#include "content/llcache.h"
+#include "content/llcache_private.h"
#include "content/urldb.h"
/** Define to enable tracing of llcache operations. */
@@ -93,27 +93,6 @@ typedef struct {
bool outstanding_query; /**< Waiting for a query response */
} llcache_fetch_ctx;
-typedef enum {
- LLCACHE_VALIDATE_FRESH, /**< Only revalidate if not fresh */
- LLCACHE_VALIDATE_ALWAYS, /**< Always revalidate */
- LLCACHE_VALIDATE_ONCE /**< Revalidate once only */
-} llcache_validate;
-
-/** Cache control data */
-typedef struct {
- time_t req_time; /**< Time of request */
- time_t res_time; /**< Time of response */
- time_t fin_time; /**< Time of request completion */
- time_t date; /**< Date: response header */
- time_t expires; /**< Expires: response header */
-#define INVALID_AGE -1
- int age; /**< Age: response header */
- int max_age; /**< Max-Age Cache-control parameter */
- llcache_validate no_cache; /**< No-Cache Cache-control parameter */
- char *etag; /**< Etag: response header */
- time_t last_modified; /**< Last-Modified: response header */
-} llcache_cache_control;
-
/** Representation of a fetch header */
typedef struct {
char *name; /**< Header name */
@@ -1028,6 +1007,79 @@ static nserror llcache_object_remove_from_list(llcache_object *object,
}
/**
+ * Retrieve source data for an object from persistant store if necessary.
+ *
+ * If an objects source data has been placed in the persistant store
+ * and the in memory copy freed this will attempt to retrive the
+ * source data.
+ *
+ * @param object the object to operate on.
+ *
+ */
+static nserror
+llcache_persist_retrieve(llcache_object *object)
+{
+ /* ensure the source data is present if necessary */
+ if ((object->source_data != NULL) ||
+ (object->store_state != LLCACHE_STORE_DISC)) {
+ /* source data does not require retriving from
+ * persistant store.
+ */
+ return NSERROR_OK;
+ }
+
+ /* Source data for the object may be in the persiatant store */
+ return guit->llcache->retrieve(object->url,
+ &object->cache,
+ &object->source_data,
+ &object->source_len);
+}
+
+static nserror
+llcache_object_persist_fetch(llcache_object *object,
+ uint32_t flags,
+ nsurl *referer,
+ const llcache_post_data *post,
+ uint32_t redirect_count)
+{
+ nserror error;
+ nsurl *referer_clone = NULL;
+ llcache_post_data *post_clone = NULL;
+
+ /* attempt to retrieve object from the cache */
+ error = guit->llcache->retrieve(object->url,
+ &object->cache,
+ &object->source_data,
+ &object->source_len);
+ if (error != NSERROR_OK)
+ return error;
+
+ /* entry came out of cache - need to setup object state */
+ if (post != NULL) {
+ error = llcache_post_data_clone(post, &post_clone);
+ if (error != NSERROR_OK)
+ return error;
+ }
+
+ if (referer != NULL)
+ referer_clone = nsurl_ref(referer);
+
+ object->fetch.flags = flags;
+ object->fetch.referer = referer_clone;
+ object->fetch.post = post_clone;
+ object->fetch.redirect_count = redirect_count;
+
+ /* fetch is "finished" */
+ object->fetch.state = LLCACHE_FETCH_COMPLETE;
+ object->fetch.fetch = NULL;
+
+ object->store_state = LLCACHE_STORE_DISC;
+ object->source_alloc = object->source_len;
+
+ return NSERROR_OK;
+}
+
+/**
* Retrieve a potentially cached object
*
* \param url URL of object to retrieve
@@ -1050,127 +1102,136 @@ llcache_object_retrieve_from_cache(nsurl *url,
llcache_object *obj, *newest = NULL;
#ifdef LLCACHE_TRACE
- LOG(("Searching cache for %s (%x %s %p)", url, flags, referer, post));
+ LOG(("Searching cache for %s (%x %s %p)",
+ nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
/* Search for the most recently fetched matching object */
for (obj = llcache->cached_objects; obj != NULL; obj = obj->next) {
if ((newest == NULL ||
- obj->cache.req_time > newest->cache.req_time) &&
- nsurl_compare(obj->url, url,
- NSURL_COMPLETE) == true) {
+ obj->cache.req_time > newest->cache.req_time) &&
+ nsurl_compare(obj->url, url,
+ NSURL_COMPLETE) == true) {
newest = obj;
}
}
- if (newest != NULL && llcache_object_is_fresh(newest)) {
- /* Found a suitable object, and it's still fresh, so use it */
- obj = newest;
+ if ((newest != NULL) && (llcache_object_is_fresh(newest))) {
+ /* Found a suitable object, and it's still fresh */
#ifdef LLCACHE_TRACE
- LOG(("Found fresh %p", obj));
+ LOG(("Found fresh %p", newest));
#endif
/* The client needs to catch up with the object's state.
* This will occur the next time that llcache_poll is called.
*/
- /* the objects source data may be in the persiatant store */
- if ((obj->store_state == LLCACHE_STORE_DISC) &&
- (obj->source_data == NULL)) {
- int remaining;
- error = guit->llcache->retrieve(obj->url,
- &remaining,
- &obj->source_data,
- &obj->source_len);
- if (error != NSERROR_OK) {
- /* persistant store failed, destroy
- * cache object and re-retch
- */
-#ifdef LLCACHE_TRACE
- LOG(("Persistant retrival failed for %p", obj));
-#endif
+ /* ensure the source data is present */
+ error = llcache_persist_retrieve(newest);
+ if (error == NSERROR_OK) {
+ /* source data was sucessfully retrived from
+ * persistant store
+ */
+ *result = newest;
- llcache_object_remove_from_list(obj,
- &llcache->cached_objects);
- llcache_object_destroy(obj);
+ return NSERROR_OK;
+ }
- /* Create new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* retrival of source data from persistant store
+ * failed, destroy cache object and fall though to
+ * cache miss to re-retch
+ */
+#ifdef LLCACHE_TRACE
+ LOG(("Persistant retrival failed for %p", newest));
+#endif
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags,
- referer, post,
- redirect_count);
- if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
- }
+ llcache_object_remove_from_list(newest, &llcache->cached_objects);
+ llcache_object_destroy(newest);
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
- }
- }
} else if (newest != NULL) {
/* Found a candidate object but it needs freshness validation */
- /* Create a new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* ensure the source data is present */
+ error = llcache_persist_retrieve(newest);
+ if (error == NSERROR_OK) {
+
+ /* Create a new object */
+ error = llcache_object_new(url, &obj);
+ if (error != NSERROR_OK)
+ return error;
#ifdef LLCACHE_TRACE
- LOG(("Found candidate %p (%p)", obj, newest));
+ LOG(("Found candidate %p (%p)", obj, newest));
#endif
- /* Clone candidate's cache data */
- error = llcache_object_clone_cache_data(newest, obj, true);
- if (error != NSERROR_OK) {
- llcache_object_destroy(obj);
- return error;
- }
+ /* Clone candidate's cache data */
+ error = llcache_object_clone_cache_data(newest, obj, true);
+ if (error != NSERROR_OK) {
+ llcache_object_destroy(obj);
+ return error;
+ }
- /* Record candidate, so we can fall back if it is still fresh */
- newest->candidate_count++;
- obj->candidate = newest;
+ /* Record candidate, so we can fall back if it is still fresh */
+ newest->candidate_count++;
+ obj->candidate = newest;
- /* Attempt to kick-off fetch */
- error = llcache_object_fetch(obj, flags, referer, post,
- redirect_count);
- if (error != NSERROR_OK) {
- newest->candidate_count--;
- llcache_object_destroy(obj);
- return error;
+ /* Attempt to kick-off fetch */
+ error = llcache_object_fetch(obj, flags, referer, post,
+ redirect_count);
+ if (error != NSERROR_OK) {
+ newest->candidate_count--;
+ llcache_object_destroy(obj);
+ return error;
+ }
+
+ /* Add new object to cache */
+ llcache_object_add_to_list(obj, &llcache->cached_objects);
+
+ *result = obj;
+
+ return NSERROR_OK;
}
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
- } else {
- /* No object found; create a new one */
- /* Create new object */
- error = llcache_object_new(url, &obj);
- if (error != NSERROR_OK)
- return error;
+ /* retrival of source data from persistant store
+ * failed, destroy cache object and fall though to
+ * cache miss to re-retch
+ */
+#ifdef LLCACHE_TRACE
+ LOG(("Persistant retrival failed for %p", newest));
+#endif
+ llcache_object_remove_from_list(newest,
+ &llcache->cached_objects);
+ llcache_object_destroy(newest);
+ } else {
#ifdef LLCACHE_TRACE
- LOG(("Not found %p", obj));
+ LOG(("Not found"));
#endif
+ }
+ /* No viable object found in cache; create a new object */
+ error = llcache_object_new(url, &obj);
+ if (error != NSERROR_OK)
+ return error;
+
+ /* attempt to "fetch" object from persistant store first */
+ error = llcache_object_persist_fetch(obj, flags, referer, post,
+ redirect_count);
+ if (error != NSERROR_OK) {
/* Attempt to kick-off fetch */
error = llcache_object_fetch(obj, flags, referer, post,
- redirect_count);
+ redirect_count);
if (error != NSERROR_OK) {
llcache_object_destroy(obj);
return error;
}
-
- /* Add new object to cache */
- llcache_object_add_to_list(obj, &llcache->cached_objects);
}
+ /* Add new object to cache */
+ llcache_object_add_to_list(obj, &llcache->cached_objects);
+
*result = obj;
return NSERROR_OK;
@@ -1197,7 +1258,7 @@ static nserror llcache_object_retrieve(nsurl *url, uint32_t flags,
nsurl *defragmented_url;
#ifdef LLCACHE_TRACE
- LOG(("Retrieve %s (%x, %s, %p)", url, flags, referer, post));
+ LOG(("Retrieve %s (%x, %s, %p)", nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post));
#endif
/**
@@ -1747,7 +1808,7 @@ static void llcache_persist(void *p)
(remaining_lifetime > LLCACHE_MIN_DISC_LIFETIME)) {
/* ok found an object to write */
ret = guit->llcache->persist(object->url,
- remaining_lifetime,
+ &object->cache,
object->source_data,
object->source_len);
if (ret != NSERROR_OK) {
diff --git a/content/llcache.h b/content/llcache.h
index 1faba81..3d8232c 100644
--- a/content/llcache.h
+++ b/content/llcache.h
@@ -131,12 +131,6 @@ typedef struct {
} data;
} llcache_query;
-/** operation table */
-struct gui_llcache_table {
- nserror (*persist)(struct nsurl *url, int remaining, const uint8_t *data, const size_t datalen);
- nserror (*retrieve)(struct nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out);
-};
-
/**
* Response handler for fetch-related queries
*
diff --git a/content/llcache_private.h b/content/llcache_private.h
new file mode 100644
index 0000000..926773b
--- /dev/null
+++ b/content/llcache_private.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 Vincent Sanders <vince(a)netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Low-level resource cache private interface
+ */
+
+#ifndef NETSURF_CONTENT_LLCACHE_PRIVATE_H_
+#define NETSURF_CONTENT_LLCACHE_PRIVATE_H_
+
+#include "content/llcache.h"
+
+/** validation control */
+typedef enum {
+ LLCACHE_VALIDATE_FRESH, /**< Only revalidate if not fresh */
+ LLCACHE_VALIDATE_ALWAYS, /**< Always revalidate */
+ LLCACHE_VALIDATE_ONCE /**< Revalidate once only */
+} llcache_validate;
+
+/** cache control value for invalid age */
+#define INVALID_AGE -1
+
+/** Cache control data */
+typedef struct {
+ time_t req_time; /**< Time of request */
+ time_t res_time; /**< Time of response */
+ time_t fin_time; /**< Time of request completion */
+ time_t date; /**< Date: response header */
+ time_t expires; /**< Expires: response header */
+ int age; /**< Age: response header */
+ int max_age; /**< Max-Age Cache-control parameter */
+ llcache_validate no_cache; /**< No-Cache Cache-control parameter */
+ char *etag; /**< Etag: response header */
+ time_t last_modified; /**< Last-Modified: response header */
+} llcache_cache_control;
+
+/** operation table */
+struct gui_llcache_table {
+ nserror (*persist)(struct nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen);
+ nserror (*retrieve)(struct nsurl *url, llcache_cache_control *cache_control, uint8_t **data, size_t *datalen);
+};
+
+#endif
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index e7d2994..37fee39 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -17,6 +17,8 @@
*/
#include "content/hlcache.h"
+#include "content/llcache_private.h"
+
#include "desktop/download.h"
#include "desktop/gui_factory.h"
@@ -343,12 +345,12 @@ static nserror verify_utf8_register(struct gui_utf8_table *gut)
return NSERROR_OK;
}
-static nserror gui_default_persist(nsurl *url, int remaining, const uint8_t *data, const size_t datalen)
+static nserror gui_default_persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
return NSERROR_SAVE_FAILED;
}
-static nserror gui_default_retrieve(nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out)
+static nserror gui_default_retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
{
return NSERROR_NOT_FOUND;
}
diff --git a/gtk/llcache.c b/gtk/llcache.c
index ef00641..e6bf7aa 100644
--- a/gtk/llcache.c
+++ b/gtk/llcache.c
@@ -16,22 +16,26 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/** \file
+ * Low-level resource cache persistant storage implementation.
+ */
+
#include "utils/nsurl.h"
#include "utils/log.h"
#include "desktop/gui.h"
-#include "content/llcache.h"
+#include "content/llcache_private.h"
#include "gtk/llcache.h"
static nserror
-persist(nsurl *url, int remaining, const uint8_t *data, const size_t datalen)
+persist(nsurl *url, llcache_cache_control *cache_control, const uint8_t *data, const size_t datalen)
{
LOG(("Writing cache file for url:%s", nsurl_access(url)));
return NSERROR_OK;
}
static nserror
-retrieve(nsurl *url, int *remaining_out, uint8_t **data_out, size_t *datalen_out)
+retrieve(nsurl *url, llcache_cache_control *cache_control, uint8_t **data_out, size_t *datalen_out)
{
return NSERROR_NOT_FOUND;
}
--
NetSurf Browser
9 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.0-1109-gdf5e5fb
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/df5e5fb4875671181070f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/df5e5fb4875671181070f38...
...tree http://git.netsurf-browser.org/netsurf.git/tree/df5e5fb4875671181070f38cf...
The branch, master has been updated
via df5e5fb4875671181070f38cf15b5696d091a924 (commit)
from ef6b20fe83895279e5e78b336f357ff657f46407 (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=df5e5fb487567118107...
commit df5e5fb4875671181070f38cf15b5696d091a924
Author: François Revol <revol(a)free.fr>
Commit: François Revol <revol(a)free.fr>
Fix build
Drop broken explicit cast.
diff --git a/beos/gui.cpp b/beos/gui.cpp
index b40e6bd..646356a 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -644,7 +644,7 @@ static void gui_init(int argc, char** argv)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create((browser_window_nav_flags)
+ error = browser_window_create(
BW_CREATE_HISTORY,
url,
NULL,
-----------------------------------------------------------------------
Summary of changes:
beos/gui.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/beos/gui.cpp b/beos/gui.cpp
index b40e6bd..646356a 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -644,7 +644,7 @@ static void gui_init(int argc, char** argv)
/* create an initial browser window */
error = nsurl_create(addr, &url);
if (error == NSERROR_OK) {
- error = browser_window_create((browser_window_nav_flags)
+ error = browser_window_create(
BW_CREATE_HISTORY,
url,
NULL,
--
NetSurf Browser
9 years, 1 month
- 1
- 0