Changeset 568

Show
Ignore:
Timestamp:
12/05/03 01:21:09 (5 years ago)
Author:
mikelittle
Message:

Fixed several instances in WordPress where PHP Notices are not being handled correctly.
Fixes supplied by Aaron Jensen (aaron@visualprose.com).
Plus removed currently unworkable 304 handling

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-rdf.php

    r558 r568  
    11<?php /* RDF 1.0 generator, original version by garym@teledyn.com */ 
    22$blog = 1; // enter your blog's ID 
    3 $doing_rss=1; 
    4 header('Content-type: text/xml'); 
    5  
     3$doing_rss = 1; 
     4header('Content-type: text/xml', true); 
    65include('blog.header.php'); 
    76 
    8 // Handle Conditional GET 
    9  
    107// Get the time of the most recent article 
    11 $sql = "SELECT max(post_date) FROM $tableposts"; 
    12  
    13 $maxdate = $wpdb->get_var($sql); 
    14 ++$querycount; 
     8$maxdate = $wpdb->get_var("SELECT max(post_date) FROM $tableposts"); 
    159$unixtime = strtotime($maxdate); 
    1610 
    1711// format timestamp for Last-Modified header 
    18 $clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime); 
    19 $cetag = md5($last); 
    20  
    21 $slast = $_SERVER['HTTP_IF_MODIFIED_SINCE']; 
    22 $setag = $_SERVER['HTTP_IF_NONE_MATCH']; 
     12$clast = gmdate("D, d M Y H:i:s \G\M\T", $unixtime); 
     13$cetag = (isset($clast)) ? md5($clast) : ''; 
    2314 
    2415// send it in a Last-Modified header 
    2516header("Last-Modified: " . $clast, true); 
    2617header("Etag: " . $cetag, true); 
    27  
    28 // compare it to aggregator's If-Modified-Since and If-None-Match headers 
    29 // if they match, send a 304 and die 
    30  
    31 // This logic says that if only one header is provided, just use that one, 
    32 // but if both headers exist, they *both* must match up with the locally 
    33 // generated values. 
    34 //if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){ 
    35 if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) {  
    36     header("HTTP/1.1 304 Not Modified"); 
    37     echo "\r\n\r\n"; 
    38     exit; 
    39 } 
    4018 
    4119add_filter('the_content', 'trim'); 

  • trunk/wp-rss.php

    r559 r568  
    33$blog = 1; // enter your blog's ID 
    44$doing_rss = 1; 
    5 header('Content-type: text/xml',true); 
     5header('Content-type: text/xml', true); 
    66include('blog.header.php'); 
    7  
    8 // Handle Conditional GET 
    97 
    108// Get the time of the most recent article 
    119$maxdate = $wpdb->get_var("SELECT max(post_date) FROM $tableposts"); 
    12 ++$querycount; 
    1310$unixtime = strtotime($maxdate); 
    1411 
    1512// format timestamp for Last-Modified header 
    1613$clast = gmdate("D, d M Y H:i:s \G\M\T", $unixtime); 
    17 $cetag = (isset($last)) ? md5($last) : ''; 
    18  
    19 $slast = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : '' ; 
    20 $setag = (isset($_SERVER['HTTP_IF_NONE_MATCH'])) ? $_SERVER['HTTP_IF_NONE_MATCH'] : ''; 
     14$cetag = (isset($clast)) ? md5($clast) : ''; 
    2115 
    2216// send it in a Last-Modified header 
    2317header("Last-Modified: " . $clast, true); 
    2418header("Etag: " . $cetag, true); 
    25  
    26 // compare it to aggregator's If-Modified-Since and If-None-Match headers 
    27 // if they match, send a 304 and die 
    28  
    29 // This logic says that if only one header is provided, just use that one, 
    30 // but if both headers exist, they *both* must match up with the locally 
    31 // generated values. 
    32 //if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){ 
    33 if (($slast != '') && ($setag != '')) { 
    34     if (($slast == $clast) && ($setag == $cetag)) { 
    35         header("HTTP/1.1 304 Not Modified"); 
    36         echo "\r\n\r\n"; 
    37         exit; 
    38     } else if (($slast == $clast) 
    39                || ($setag == $cetag)) { 
    40         header("HTTP/1.1 304 Not Modified"); 
    41         echo "\r\n\r\n"; 
    42         exit; 
    43     } 
    44 } 
    4519 
    4620if (!isset($rss_language)) { $rss_language = 'en'; } 

  • trunk/wp-rss2.php

    r558 r568  
    11<?php  
    2 $blog=1; 
    3 $doing_rss=1; 
    4 header('Content-type: text/xml'); 
    5  
     2$blog = 1; 
     3$doing_rss = 1; 
     4header('Content-type: text/xml', true); 
    65include('blog.header.php'); 
    76 
    8 // Handle Conditional GET 
    9  
    107// Get the time of the most recent article 
    11 $sql = "SELECT max(post_date) FROM $tableposts"; 
    12  
    13 $maxdate = $wpdb->get_var($sql); 
    14 ++$querycount; 
    15  
     8$maxdate = $wpdb->get_var("SELECT max(post_date) FROM $tableposts"); 
    169$unixtime = strtotime($maxdate); 
    1710 
    1811// format timestamp for Last-Modified header 
    19 $clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime); 
    20 $cetag = md5($last); 
    21  
    22 $slast = $_SERVER['HTTP_IF_MODIFIED_SINCE']; 
    23 $setag = $_SERVER['HTTP_IF_NONE_MATCH']; 
     12$clast = gmdate("D, d M Y H:i:s \G\M\T", $unixtime); 
     13$cetag = (isset($clast)) ? md5($clast) : ''; 
    2414 
    2515// send it in a Last-Modified header 
    2616header("Last-Modified: " . $clast, true); 
    2717header("Etag: " . $cetag, true); 
    28  
    29 // compare it to aggregator's If-Modified-Since and If-None-Match headers 
    30 // if they match, send a 304 and die 
    31  
    32 // This logic says that if only one header is provided, just use that one, 
    33 // but if both headers exist, they *both* must match up with the locally 
    34 // generated values. 
    35 //if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){ 
    36 if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) {  
    37     header("HTTP/1.1 304 Not Modified"); 
    38     echo "\r\n\r\n"; 
    39     exit; 
    40 } 
    4118 
    4219if (!isset($rss_language)) { $rss_language = 'en'; }