wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zebediah Figura : vkd3d-utils: Allow writing log output via a custom callback.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: vkd3d Branch: master Commit: 64b784dbb942dbb7471edfc6e6e3cc7dc3ac6174 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=64b784dbb942dbb7471edfc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 1 19:01:02 2022 -0500 vkd3d-utils: Allow writing log output via a custom callback. When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_utils.h | 15 +++++++++++++++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 56524782..6e84b176 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -75,6 +75,21 @@ VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, cons const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +/** + * Set a callback to be called when vkd3d-utils outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d-utils will print + * all enabled log output to stderr. + * + * Calling this function will also set the log callback for libvkd3d and + * libvkd3d-shader. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_UTILS_API void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 1e46cd86..14eb439e 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -15,6 +15,7 @@ global: vkd3d_create_event; vkd3d_destroy_event; vkd3d_signal_event; + vkd3d_utils_set_log_callback; vkd3d_wait_event; local: *; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 22953c46..64418893 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -536,3 +536,9 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) } return hr; } + +void vkd3d_utils_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_set_log_callback(callback); + vkd3d_dbg_set_log_callback(callback); +}

1 0

Zebediah Figura : vkd3d: Allow writing log output via a custom callback.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: vkd3d Branch: master Commit: 46b12668098a26eabb57ae545de2ed85d2e9117e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=46b12668098a26eabb57ae5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 1 19:01:01 2022 -0500 vkd3d: Allow writing log output via a custom callback. When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 17 +++++++++++++++++ libs/vkd3d/vkd3d.map | 1 + libs/vkd3d/vkd3d_main.c | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index bce3c6e4..f3c3fdc6 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -212,6 +212,20 @@ VKD3D_API HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED VKD3D_API HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +/** + * Set a callback to be called when vkd3d outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d will print all + * enabled log output to stderr. + * + * Calling this function will also set the log callback for libvkd3d-shader. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_API void vkd3d_set_log_callback(PFN_vkd3d_log callback); + #endif /* VKD3D_NO_PROTOTYPES */ /* @@ -255,6 +269,9 @@ typedef HRESULT (*PFN_vkd3d_serialize_versioned_root_signature)(const D3D12_VERS typedef HRESULT (*PFN_vkd3d_create_versioned_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +/** Type of vkd3d_set_log_callback(). \since 1.4 */ +typedef void (*PFN_vkd3d_set_log_callback)(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 6f1f3761..441b2e35 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -22,6 +22,7 @@ global: vkd3d_resource_incref; vkd3d_serialize_root_signature; vkd3d_serialize_versioned_root_signature; + vkd3d_set_log_callback; local: *; }; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 21d998bf..88301fbb 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -510,3 +510,9 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN } return hr; } + +void vkd3d_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_shader_set_log_callback(callback); + vkd3d_dbg_set_log_callback(callback); +}

1 0

Zebediah Figura : vkd3d-shader: Allow writing log output via a custom callback.
by Alexandre Julliard 07 Jun '22

07 Jun '22

Module: vkd3d Branch: master Commit: 174172887b2b8c5a1a0e2d94c4c596511664ac61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=174172887b2b8c5a1a0e2d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 1 19:01:00 2022 -0500 vkd3d-shader: Allow writing log output via a custom callback. When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 15 +++++++++++++++ include/vkd3d_types.h | 4 ++++ libs/vkd3d-common/debug.c | 28 ++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 5 +++++ 6 files changed, 52 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8ab653ae..579c33d3 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -47,6 +47,7 @@ enum vkd3d_dbg_level enum vkd3d_dbg_level vkd3d_dbg_get_level(void); void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback); const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 05d235f9..1e5a332e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1806,6 +1806,18 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_sig VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** + * Set a callback to be called when vkd3d-shader outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d-shader will print + * all enabled log output to stderr. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_SHADER_API void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ @@ -1859,6 +1871,9 @@ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signa typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** Type of vkd3d_shader_set_log_callback(). \since 1.4 */ +typedef void (*PFN_vkd3d_shader_set_log_callback)(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 7014f4c2..4a7aca23 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_TYPES_H #define __VKD3D_TYPES_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,6 +55,8 @@ enum vkd3d_result VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; +typedef void (*PFN_vkd3d_log)(const char *format, va_list args); + #ifdef _WIN32 # define VKD3D_IMPORT __declspec(dllimport) # define VKD3D_EXPORT __declspec(dllexport) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 4868f3fb..0b9e765a 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -68,6 +68,25 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) return level; } +static PFN_vkd3d_log log_callback; + +static void vkd3d_dbg_voutput(const char *fmt, va_list args) +{ + if (log_callback) + log_callback(fmt, args); + else + vfprintf(stderr, fmt, args); +} + +static void vkd3d_dbg_output(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_dbg_voutput(fmt, args); + va_end(args); +} + void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) { va_list args; @@ -77,12 +96,17 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); - fprintf(stderr, "%s:%s: ", debug_level_names[level], function); + vkd3d_dbg_output("%s:%s ", debug_level_names[level], function); va_start(args, fmt); - vfprintf(stderr, fmt, args); + vkd3d_dbg_voutput(fmt, args); va_end(args); } +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback) +{ + log_callback = callback; +} + static char *get_buffer(void) { static char buffers[VKD3D_DEBUG_BUFFER_COUNT][VKD3D_DEBUG_BUFFER_SIZE]; diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 2e49fe24..cac96972 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -17,6 +17,7 @@ global: vkd3d_shader_preprocess; vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; + vkd3d_shader_set_log_callback; local: *; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6fd32435..7d0157fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1550,3 +1550,8 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_message_context_cleanup(&message_context); return ret; } + +void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_dbg_set_log_callback(callback); +}

1 0

Jeremy Newman : fix format of timestamp in last modified
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: 341085bdc1e82bc7b63a602658e6f063b193f73c URL: https://source.winehq.org/git/website.git/?a=commit;h=341085bdc1e82bc7b63a6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 12:43:08 2022 -0500 fix format of timestamp in last modified --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index 9a158435..e72bfc93 100644 --- a/include/html.php +++ b/include/html.php @@ -1612,7 +1612,7 @@ class html $this->set_last_modified(-1); header("Content-type: ".$type."; charset=UTF-8"); header("Cache-Control: public, max-age=86400"); - header("Last-Modified: " . gmdate("D, d M Y H:i:s", $this->last_modified . " GMT")); + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $this->last_modified) . " GMT"); } // REDIRECT (simple httpd header redirect)

1 0

Jeremy Newman : set last modified
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: 4cebcb6bb5cf53bf7a3ed6fd080cc9def4e61c18 URL: https://source.winehq.org/git/website.git/?a=commit;h=4cebcb6bb5cf53bf7a3ed… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 11:23:50 2022 -0500 set last modified --- include/wwn.php | 95 +++++++++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/include/wwn.php b/include/wwn.php index 6aeb7d35..da29b781 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -27,28 +27,28 @@ class wwn $this->summary = array(); $this->person = array(); $this->map_array = array( - "a" => "a", - "b" => "b", - "blockquote" => "blockquote", - "center" => "center", - "code" => "code", - "div" => "div", - "font" => "font", - "i" => "i", - "img" => "img", - "li" => "li", - "table" => "table", - "tr" => "tr", - "td" => "td", - "th" => "th", - "dt" => "dt", - "dd" => "dd", - "tt" => "tt", - "pre" => "pre", - "u" => "u", - "ul" => "ul", - "ol" => "ol", - ); + "a" => "a", + "b" => "b", + "blockquote" => "blockquote", + "center" => "center", + "code" => "code", + "div" => "div", + "font" => "font", + "i" => "i", + "img" => "img", + "li" => "li", + "table" => "table", + "tr" => "tr", + "td" => "td", + "th" => "th", + "dt" => "dt", + "dd" => "dd", + "tt" => "tt", + "pre" => "pre", + "u" => "u", + "ul" => "ul", + "ol" => "ol", + ); } // read dir and get issues @@ -64,6 +64,7 @@ class wwn default: $dir = opendir($config->wwn_xml_path."/".$config->lang); } + $old = 0; while($file = readdir($dir)) { if ($file == "." or $file == ".." or $file == "CVS" or $file == "interviews") @@ -205,6 +206,10 @@ class wwn { global $html; + $fdate = DateTime::createFromFormat('m/d/Y', $date); + if (!empty($fdate)) + $html->set_last_modified($fdate->format("Y-m-d H:i:s"), true); + switch ($this->mode) { case "interviews": @@ -266,11 +271,15 @@ class wwn 'body' => $this->body, ); + $date = DateTime::createFromFormat('m/d/Y', $this->issue); + if (!empty($date)) + $html->set_last_modified($date->format("Y-m-d H:i:s"), true); + return $html->template("base", "wwn_content", $wwn_vars);; } // display a single wwn issue - public function view_interview($interview) + public function view_interview ($interview) { global $config, $html; @@ -292,11 +301,15 @@ class wwn // load issue into template $wwn_vars = array( - 'who' => $this->who, - 'date' => $this->issue, - 'author' => $html->ahref($this->author, 'mailto:'.$this->email), - 'body' => $this->body, - ); + 'who' => $this->who, + 'date' => $this->issue, + 'author' => $html->ahref($this->author, 'mailto:'.$this->email), + 'body' => $this->body, + ); + + $date = DateTime::createFromFormat('m/d/Y', $this->issue); + if (!empty($date)) + $html->set_last_modified($date->format("Y-m-d H:i:s"), true); return $html->template("base", "wwn_interview", $wwn_vars); } @@ -382,11 +395,11 @@ class wwn break; case "ISSUE": $this->issue = $attrs{'DATE'}; - $this->who = $attrs{'WHO'}; + $this->who = (!empty($attrs{'WHO'}) ? $attrs{'WHO'} : ''); break; case "AUTHOR": - $this->email = $attrs{'EMAIL'}; - $this->contact = $attrs{'CONTACT'}; + $this->email = (!empty($attrs{'EMAIL'}) ? $attrs{'EMAIL'} : ''); + $this->contact = (!empty($attrs{'CONTACT'}) ? $attrs{'CONTACT'} : ''); break; case "INTRO": $this->body .= "<a name=\"Intro\"></a>\n"; @@ -398,8 +411,10 @@ class wwn $this->body .= "<table>\n"; $this->body .= "<tr>\n"; $this->body .= "<th width=\"100%\">".$attrs{'TITLE'}."</th>\n"; - $this->body .= "<th>".$attrs{'STARTDATE'}."</td>\n"; - $this->body .= "<th><a href=\"".$attrs{'ARCHIVE'}."\">Archive</a></th>\n"; + if (!empty($attrs{'STARTDATE'})) + $this->body .= "<th>".$attrs{'STARTDATE'}."</td>\n"; + if (!empty($attrs{'ARCHIVE'})) + $this->body .= "<th><a href=\"".$attrs{'ARCHIVE'}."\">Archive</a></th>\n"; $this->body .= "</tr>\n"; $this->body .= "<tr><td colspan=\"3\">\n"; break; @@ -410,18 +425,18 @@ class wwn $this->body .= "<table>\n"; $this->body .= "<tr><td colspan=\"3\">\n"; $this->body .= "<p> This week, ".$attrs{'POSTS'}." posts consumed ".$attrs{'SIZE'}." K. ". - "There were ".$attrs{'CONTRIB'}." different contributors. ". - $attrs{'MULTIPLES'}." (".$pctMTO."%) posted more than once. ". - $attrs{'LASTWEEK'}." (".$pctLWK."%) posted last week too.</p>\n". - "<p>The top 5 posters of the week were:</p>\n"; + "There were ".$attrs{'CONTRIB'}." different contributors. ". + $attrs{'MULTIPLES'}." (".$pctMTO."%) posted more than once. ". + $attrs{'LASTWEEK'}." (".$pctLWK."%) posted last week too.</p>\n". + "<p>The top 5 posters of the week were:</p>\n"; break; case "PERSON": array_push( $this->person, array( - "WHO" => $attrs{'WHO'}, - "POSTS" => $attrs{'POSTS'}, - "SIZE" => $attrs{'SIZE'} + "WHO" => (!empty($attrs{'WHO'}) ? $attrs{'WHO'} : ''), + "POSTS" => (!empty($attrs{'POSTS'}) ? $attrs{'POSTS'} : ''), + "SIZE" => (!empty($attrs{'SIZE'}) ? $attrs{'SIZE'} : '') ) ); break;

1 0

Jeremy Newman : set last modified
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: bde735d32293d57d6c26229726bcdab34de654e1 URL: https://source.winehq.org/git/website.git/?a=commit;h=bde735d32293d57d6c262… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 11:22:38 2022 -0500 set last modified --- include/plugins/wwn.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/plugins/wwn.php b/include/plugins/wwn.php index 45fd48d9..8dc6346e 100644 --- a/include/plugins/wwn.php +++ b/include/plugins/wwn.php @@ -10,7 +10,7 @@ $wwn = new wwn(); // change display mased on mode -switch ($_PLUGIN['mode']) +switch ((!empty($_PLUGIN['mode']) ? $_PLUGIN['mode'] : '')) { // interviews case "interviews": @@ -47,12 +47,9 @@ switch ($_PLUGIN['mode']) if (file_exists($xmlFile)) { $html->clear_buffer(). - header('Content-Description: File Transfer'); header('Content-Type: text/xml'); + header('Content-Description: File Transfer'); header('Content-Disposition: attachment; filename='.$issue.".xml"); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); header('Content-Length: '.filesize($xmlFile)); readfile($xmlFile); exit(); @@ -78,7 +75,7 @@ switch ($_PLUGIN['mode']) // default view (list of WWN issues) default: $issues = $wwn->get_list(); - echo $wwn->issues_list($issues[0], $issues[1], 0, $_GET['pos']); + echo $wwn->issues_list($issues[0], $issues[1], 0, (!empty($_GET['pos']) ? $_GET['pos'] : 0)); // end default } // end wwn param switch

1 0

Jeremy Newman : set_last_modified: allow date in future
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: f5614e07f9bc16fcfadfd8d44767a928e1bf9a92 URL: https://source.winehq.org/git/website.git/?a=commit;h=f5614e07f9bc16fcfadfd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 11:21:01 2022 -0500 set_last_modified: allow date in future --- include/html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index 46c95f46..9a158435 100644 --- a/include/html.php +++ b/include/html.php @@ -439,8 +439,8 @@ class html if ($convert) $time = strtotime($time); - // if time is newer, then update last modified - if ($time <= time() and $time > $this->last_modified) + // if time is newer then update last modified + if ($time > $this->last_modified) { debug("global", "last-modified: " . gmdate("D, d M Y H:i:s", $time) . " GMT"); $this->last_modified = $time;

1 0

Jeremy Newman : set last modified
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: cbf2baf528376a783a3c99d70fc92e3985df197b URL: https://source.winehq.org/git/website.git/?a=commit;h=cbf2baf528376a783a3c9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 10:41:43 2022 -0500 set last modified --- include/plugins/announce.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 39bcd25a..38a59371 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -13,10 +13,14 @@ $ver = PAGE_PARAMS; // build tag and announce URL $tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; +debug('global', "announce: {$announce}"); // announce title $title = ""; +// set html last modified +$html->set_last_modified(-1); + // load announce if ($arr = file($announce)) { @@ -43,7 +47,7 @@ if ($arr = file($announce)) "<a href=\"".$config->git_tree."/wine.git/".$tag.":\\0\">\\0</a>", $arr[$c]); } - else if ($in_bugs) + else if (!empty($in_bugs)) { $arr[$c] = preg_replace("/^( +)([0-9]+)/", "\\1<a href=\"".$config->bug_system."\\2\">\\2</a>",

1 0

Jeremy Newman : set last modified from news dates
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: 83aad1182ff9a5c2a749434ed811d7b4cea18ec1 URL: https://source.winehq.org/git/website.git/?a=commit;h=83aad1182ff9a5c2a7494… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 10:40:29 2022 -0500 set last modified from news dates --- include/plugins/news.php | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index 94f18e30..e05dfeb6 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -58,6 +58,9 @@ switch ($flag) // The single flag guarantees vars already has the news path + // set last modified + $html->set_last_modified($vars['date'], true); + // set open graph tags $html->meta_og['title'] = trim($vars['title']); $ogmode = preg_replace('/^(.*)({\$root}\/)(wwn|announce)(\/)(.*)$/ms', '$3', $vars['body']); @@ -101,11 +104,6 @@ switch ($flag) $news = array_reverse ($news); // clear cache and output the rss file - header('Pragma: public'); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Content-Type: application/xml'); - header('Content-Disposition: inline; filename="winehq_news.xml";'); $rss_rows = ""; $c = 0; foreach ($news as $key => $item) @@ -135,24 +133,27 @@ switch ($flag) // display row $rss_row = array( - 'item_title' => strip_tags($vars['title']), - 'item_desc' => $vars['body'], - 'item_link' => $vars['link'], - 'item_guid' => $config->base_url.'?news='.$item, - 'item_date' => date("r", strtotime($vars['date'])) - ); + 'item_title' => strip_tags($vars['title']), + 'item_desc' => $vars['body'], + 'item_link' => $vars['link'], + 'item_guid' => $config->base_url.'?news='.$item, + 'item_date' => date("r", strtotime($vars['date'])) + ); $rss_rows .= $html->template('global', 'xml/rss_row', $rss_row, 1); + $html->set_last_modified($vars['date'], true); } unset($c); $rss = array( - 'rss_date' => date("r", $top_date), - 'rss_title' => "{$config->site_name} News", - 'rss_link' => "{$config->base_url}news/rss/", - 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", - 'rss_desc' => 'News and information about Wine', - 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), - 'rss_rows' => $rss_rows - ); + 'rss_date' => date("r", $top_date), + 'rss_title' => "{$config->site_name} News", + 'rss_link' => "{$config->base_url}news/rss/", + 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", + 'rss_desc' => 'News and information about Wine', + 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), + 'rss_rows' => $rss_rows + ); + $html->http_header("application/xml"); + header('Content-Disposition: inline; filename="winehq_news.xml";'); echo $html->template('global', 'xml/rss', $rss); exit(); break; @@ -210,7 +211,10 @@ switch ($flag) // add to news body echo $html->template('base', 'news_row', $vars); - + + // set last modified + $html->set_last_modified($vars['date'], true); + // show only $max if ($c - $x == $amax) break;

1 0

Jeremy Newman : last modified header support
by Jeremy Newman 07 Jun '22

07 Jun '22

Module: website Branch: master Commit: 4a98d2a130f6d220583b8fae8caae5afae10c38b URL: https://source.winehq.org/git/website.git/?a=commit;h=4a98d2a130f6d220583b8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 10:38:54 2022 -0500 last modified header support dynamically build last modified based off on content update headers for cacheing --- include/html.php | 105 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 40 deletions(-) diff --git a/include/html.php b/include/html.php index ca744580..46c95f46 100644 --- a/include/html.php +++ b/include/html.php @@ -29,6 +29,7 @@ class html private $template_cache = array(); // cache for template data private $template_vars = array(); // vars to pass to EXEC script from template private $trans_table = array(); // translation table data + private $last_modified = 0; // default last modified for header // header code in showpage() private $header_code = array('pre' => '', 'post' => ''); @@ -423,6 +424,29 @@ class html } } + // SET LAST MODIFIED + public function set_last_modified ($time = 0, $convert = false) + { + // set to current time + if ($time === -1) + { + debug("global", "last-modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); + $this->last_modified = time(); + return; + } + + // convert time from string + if ($convert) + $time = strtotime($time); + + // if time is newer, then update last modified + if ($time <= time() and $time > $this->last_modified) + { + debug("global", "last-modified: " . gmdate("D, d M Y H:i:s", $time) . " GMT"); + $this->last_modified = $time; + } + } + // HTML BR public function br ($count = 1) { @@ -981,52 +1005,53 @@ class html { global $config; - // if no theme, use default theme from config - if (!$theme) - $theme = $config->theme; - // debug debug("template", "loading template: theme:[{$theme}] lang: [{$this->lang}] template:[{$template}]"); - // load from cache if we have already loaded before - if (isset($this->template_cache[$template])) + $file = ''; + $in = ''; + + // theme determines where template is loaded from + switch ($theme) { + // load from global + case "global": + if (file_exists("{$this->_file_root}/templates/global/{$template}.template")) + $file = "{$this->_file_root}/templates/global/{$template}.template"; + break; + + // load template from theme + default: + if (file_exists("{$this->_file_root}/templates/{$this->lang}/{$template}.template")) + $file = "{$this->_file_root}/templates/{$this->lang}/{$template}.template"; + else if (($config->lang != $this->lang) and file_exists("{$this->_file_root}/templates/{$config->lang}/{$template}.template")) + $file = "{$this->_file_root}/templates/{$config->lang}/{$template}.template"; + break; + } + + // set last mofified if newer + if (!empty($file)) + { + $this->set_last_modified(filemtime($file)); + } + + // where to load data from for template + if (!empty($this->template_cache[$template])) + { + // from cache $in = $this->template_cache[$template]; } - else + else if (!empty($file)) { - // theme determines where template is loaded from - switch ($theme) - { - // load from local template repository - case "base": - case "local": - if (file_exists("{$this->_file_root}/templates/{$this->lang}/{$template}.template")) - $in = join("",file("{$this->_file_root}/templates/{$this->lang}/{$template}.template")); - else if (($config->lang != $this->lang) and file_exists("{$this->_file_root}/templates/{$config->lang}/{$template}.template")) - $in = join("",file("{$this->_file_root}/templates/{$config->lang}/{$template}.template")); - break; - - // load from global - case "global": - if (file_exists("{$this->_file_root}/templates/global/{$template}.template")) - $in = join("",file("{$this->_file_root}/templates/global/{$template}.template")); - break; - - // load template from theme - default: - if (file_exists("{$this->_file_root}/templates/{$this->lang}/global/themes/{$theme}/{$template}.template")) - $in = join("",file("{$this->_file_root}/templates/{$this->lang}/global/themes/{$theme}/{$template}.template")); - else if (($config->lang != $this->lang) and file_exists("{$this->_file_root}/templates/{$config->lang}/global/themes/{$theme}/{$template}.template")) - $in = join("",file("{$this->_file_root}/templates/{$config->lang}/global/themes/{$theme}/{$template}.template")); - } + // from file + $in = join("",file($file)); } // oops not found, load 404 template if (empty($in)) { - $in = ''; $this->in404 = 1; + $this->set_last_modified(-1); if (file_exists("{$this->_file_root}/templates/{$this->lang}/global/404.template")) $in .= join("",file("{$this->_file_root}/templates/{$this->lang}/global/404.template")); else if (file_exists("{$this->_file_root}/templates/{$config->lang}/global/404.template")) @@ -1036,7 +1061,8 @@ class html } // cache this template to save on i/o - $this->template_cache[$template] = $in; + if (empty($this->template_cache[$template])) + $this->template_cache[$template] = $in; // return the text with the vars replaced return $this->template_replace($in, $vars, $noremovetags); @@ -1579,15 +1605,14 @@ class html } } - // HTTP HEADER (better header) + // HTTP HEADER public function http_header ($type = "text/html") { + if (empty($this->last_modified)) + $this->set_last_modified(-1); header("Content-type: ".$type."; charset=UTF-8"); - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); - header("Cache-Control: no-store, no-cache, must-revalidate"); - header("Cache-Control: post-check=0, pre-check=0", false); - header("Pragma: no-cache"); + header("Cache-Control: public, max-age=86400"); + header("Last-Modified: " . gmdate("D, d M Y H:i:s", $this->last_modified . " GMT")); } // REDIRECT (simple httpd header redirect)

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022