Fixed PHP timeout option merging bug

This commit is contained in:
Marc Aymerich 2015-06-05 12:22:17 +00:00
parent c8ceff0358
commit cf3dd5f373
3 changed files with 3 additions and 7 deletions

View file

@ -14,7 +14,7 @@ from .models import Message
def send_message(message, num=0, connection=None, bulk=100): def send_message(message, num=0, connection=None, bulk=100):
if num >= bulk: if num >= bulk and connection is not None:
connection.close() connection.close()
connection = None connection = None
if connection is None: if connection is None:

View file

@ -30,6 +30,7 @@
<tr id="transaction"> <tr id="transaction">
<th class="title column-id">ID</th> <th class="title column-id">ID</th>
<th class="title column-bill">{% trans "Bill" %}</th> <th class="title column-bill">{% trans "Bill" %}</th>
<th class="title column-account">{% trans "Account" %}</th>
<th class="title column-billcontant">{% trans "Contact" %}</th> <th class="title column-billcontant">{% trans "Contact" %}</th>
<th class="title column-iban">IBAN</th> <th class="title column-iban">IBAN</th>
<th class="title column-amount">{% trans "Amount" %}</th> <th class="title column-amount">{% trans "Amount" %}</th>
@ -41,6 +42,7 @@
<tr> <tr>
<td class="item column-id">{{ transaction.id }}</td> <td class="item column-id">{{ transaction.id }}</td>
<td class="item column-bill">{{ transaction.bill.number }}</td> <td class="item column-bill">{{ transaction.bill.number }}</td>
<td class="item column-account">{{ transaction.bill.account.username }}</td>
<td class="item column-billcontant">{{ transaction.bill.buyer.get_name }}</td> <td class="item column-billcontant">{{ transaction.bill.buyer.get_name }}</td>
<td class="item column-iban">{{ transaction.source.data.iban }}</td> <td class="item column-iban">{{ transaction.source.data.iban }}</td>
<td class="item column-amount">{{ transaction.amount }}</td> <td class="item column-amount">{{ transaction.amount }}</td>

View file

@ -37,10 +37,7 @@ The goal of this setup is having a high-performance state-of-the-art deployment
a2enmod ssl a2enmod ssl
#a2enmod auth_pam #a2enmod auth_pam
a2enmod proxy_fcgi a2enmod proxy_fcgi
a2emmod userdir
``` ```
* TODO compat module
https://httpd.apache.org/docs/trunk/mod/mod_access_compat.html
3. Configure `suexec-custom` 3. Configure `suexec-custom`
@ -57,9 +54,6 @@ The goal of this setup is having a high-performance state-of-the-art deployment
``` ```
5. Restart Apache 5. Restart Apache
```bash ```bash
service apache2 restart service apache2 restart