Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* Fixed missing progress bar config on HTTP host. Removed event

  notification mechanism directive. Nginx always chooses the best.
  • Loading branch information...
commit 6ada677cddd95cf64abf395b8c4ff689fe077acf 1 parent f9cd616
@perusio authored
Showing with 11 additions and 12 deletions.
  1. +0 −3  nginx.conf
  2. +11 −9 sites-available/example.com.conf
View
3  nginx.conf
@@ -9,9 +9,6 @@ worker_rlimit_nofile 8192;
events {
worker_connections 4096;
- ## epoll is preferred on 2.6 Linux
- ## kernels. Cf. http://www.kegel.com/c10k.html#nb.epoll
- use epoll;
## Accept as many connections as possible.
multi_accept on;
}
View
20 sites-available/example.com.conf
@@ -83,15 +83,18 @@ server {
#################################################################
#include apps/drupal/drupal_cron_update.conf;
- ## For upload progress to work. From the README of the
- ## filefield_nginx_progress module.
- location ~ ^(.*)/x-progress-id:(\w*) {
- return 302 $1?X-Progress-ID=$2;
- }
+ #################################################################
+ ### Support for upload progress bar. Configurations differ for
+ ### Drupal 6 and Drupal 7.
+ #################################################################
- location ^~ /progress {
- report_uploads uploads;
- }
+ ## This is for Drupal 7. Comment out the line below if you're on
+ ## Drupal 6.
+ include apps/drupal/drupal_upload_progress.conf;
+
+ ## This is for Drupal 6. Comment out the line above and uncomment
+ ## the line below if you're on Drupla 6.
+ #include apps/drupal/drupal6_upload_progress.conf;
## Including the php-fpm status and ping pages config.
## Uncomment to enable if you're running php-fpm.
@@ -185,7 +188,6 @@ server {
#################################################################
#include apps/drupal/drupal_cron_update.conf;
-
#################################################################
### Support for upload progress bar. Configurations differ for
### Drupal 6 and Drupal 7.

0 comments on commit 6ada677

Please sign in to comment.
Something went wrong with that request. Please try again.