OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jun-2008 20:27:24
Branch: HEAD Handle: 2008062619272300
Modified files:
openpkg-src/drupal drupal.patch
Log:
fix CSS cache building procedure by applying the missing and required
character escaping
Summary:
Revision Changes Path
1.27 +17 -3 openpkg-src/drupal/drupal.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 drupal.patch
--- openpkg-src/drupal/drupal.patch 26 Jun 2008 15:52:26 -0000 1.26
+++ openpkg-src/drupal/drupal.patch 26 Jun 2008 18:27:23 -0000 1.27
@@ -67,14 +67,19 @@
-----------------------------------------------------------------------------
-Support HTTP Proxies (mainly for update checks, RSS fetching, etc)
+1. Support HTTP Proxies (mainly for update checks, RSS fetching, etc)
http://drupal.org/node/7881
http://drupal.org/files/issues/proxy_11.patch
(post-adjusted and improved by RSE)
+2. Fix CSS Cache Building Procedure
+http://drupal.org/node/275381
+http://drupal.org/files/issues/drupal-css-cache-building.patch
+(created by RSE)
+
Index: includes/common.inc
--- includes/common.inc.orig 2008-04-09 23:11:44 +0200
-+++ includes/common.inc 2008-04-24 11:41:40 +0200
++++ includes/common.inc 2008-06-26 20:16:16 +0200
@@ -439,13 +439,27 @@
case 'http':
$port = isset($uri['port']) ? $uri['port'] : 80;
@@ -138,6 +143,15 @@
foreach ($headers as $header => $value) {
$defaults[$header] = $header .': '. $value;
}
+@@ -1805,7 +1832,7 @@
+ $last = '';
+ while ($path != $last) {
+ $last = $path;
+- $path = preg_replace('`(^|/)(?!../)([^/]+)/../`', '$1', $path);
++ $path = preg_replace('`(^|/)(?!\.\./)([^/]+)/\.\./`', '$1', $path);
+ }
+ return 'url('. $path .')';
+ }
Index: modules/system/system.admin.inc
--- modules/system/system.admin.inc.orig 2008-03-25 12:58:16 +0100
+++ modules/system/system.admin.inc 2008-04-24 11:43:07 +0200
@@ -330,7 +344,7 @@
--- /dev/null 2008-05-02 21:08:21 +0200
+++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56
+0200
@@ -0,0 +1,20 @@
-+/* $Id: drupal.patch,v 1.26 2008/06/26 15:52:26 rse Exp $ */
++/* $Id: drupal.patch,v 1.27 2008/06/26 18:27:23 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
