@bendodd made a great initial implementation of this at #974350: Far Future setting for Origin Pull mode, specifically at #974350-51: Far Future setting for Origin Pull mode. I rerolled it at #974350-55: Far Future setting for Origin Pull mode, with the following feedback:

Not yet committed. Rerolled version attached. There were several formatting issues in the help, you had renamed "File Conveyor mode" to "Origin Pull mode" in the UI, but had not reflected this in the help. This is also incorrect, since File Conveyor mode can also be used for Origin Pull mode. The section you were referring to in cdn_help_index_page() no longer existed. I've fixed all these problems, except for one: the lack of variable expansion in advanced_help. Hence you see "!extensions" at the Far Future Expiration help page. This is not acceptable. Surely, there must be supported somehow. Please create a new issue for this.

I'll post a rerolled version of that patch here ASAP.

#7 cdn.quickfix.patch335 bytesandreiashu
#1 1413162-1.patch37.23 KBWim Leers
Members fund testing for the Drupal project. Drupal Association Learn more


Wim Leers’s picture

Version: 6.x-2.x-dev » 7.x-2.x-dev
Assigned: Unassigned » Wim Leers
Status: Active » Patch (to be ported)
37.23 KB

Drupal 6 patch attached and committed: http://drupalcode.org/project/cdn.git/commit/d8302e9. I credited @bendodd in the commit because he's the one who did all the hard initial work. Thanks again :)

What I changed:
- more docs and made them more consistent
- the question mark icon now has some appropriate padding
- cleaned up the integration of all this into cdn.admin.inc

Now to be ported to Drupal 7.

Wim Leers’s picture

Status: Patch (to be ported) » Fixed

Small bugfix follow-up commit for D6: http://drupalcode.org/project/cdn.git/commit/1bfcca6

And now ported & committed to D7: http://drupalcode.org/project/cdn.git/commit/1b74280

Wim Leers’s picture

HURRAY! :) :) :)

Wim Leers’s picture

Status: Fixed » Needs work

I just realized that we're now calling theme('advanced_help_topic', …) at all times, even when Advanced Help is not enabled. We should fix that.

Wim Leers’s picture

Another follow-up patch: only perform the Advanced Help check once on the CDN admin pages.

D7: http://drupalcode.org/project/cdn.git/commit/02b24c6
D6: http://drupalcode.org/project/cdn.git/commit/1bdd88c

Wim Leers’s picture

Status: Needs work » Fixed
andreiashu’s picture

Version: 7.x-2.x-dev » 6.x-2.x-dev
Status: Fixed » Needs review
335 bytes

Hey Wim,

Great work. Here's a quick patch that should fix a fatal error (we need the requirements file). Sorry, didn't have time to get 7.x CDN version up an running yet so this is against of latest GIT 6.2

Wim Leers’s picture

Status: Needs review » Closed (fixed)

I don't see how it could fatal. It works just fine here. Maybe you're having opcode cache problems. Just below your change there is a call to _cdn_settings_form_prepare(), which calls cdn_load_include('requirements').

andreiashu’s picture

Hi Wim,

I'm getting this error when trying to submit the form at 'admin/settings/cdn/general'.

From the code I think it makes sense: _cdn_settings_form_prepare calls cdn_load_include only when $form_state['post'] is empty. Which obviously means that the include won't be called when I submit the form.

I've restarted my Apache (which should clear any APC issues) but I'm still getting the error when submitting that form.

andreiashu’s picture

Status: Closed (fixed) » Needs work

It seems there are others that are getting the error described in #7 and #9: http://drupal.org/node/1267902#comment-5532052

Wim Leers’s picture

Status: Needs work » Fixed

Gotcha. This is a problem only on D6, where there still is the "CDN integration mechanism" form item. Fixed now: http://drupalcode.org/project/cdn.git/commit/ac76681. Thanks, @andreiashu! :)

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

markl17’s picture

Issue summary: View changes

wim where in the cdn module does one put the secure id for s3 in order for s3 to take your files and put them in the s3 bucket this is a noob question forgive me