← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apache2/trusty

« back to all changes in this revision

Viewing changes to modules/proxy/NWGNUproxybalancer

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 01:28:04 UTC
  • mfrom: (14.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100505012804-vbouq0xs3tu2vvij
Tags: 2.2.15-5ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)
  + Dropped:
    - debian/patches/206-fix-potential-memory-leaks.dpatch: No longer needed.
    - debian/patches/206-report-max-client-mpm-worker.dpatch: No longer needed.
    - debian/config-dir/apache2.conf: Merged back from debian.
    - mod-reqtimeout functionality: Merge back from debian.
    - debian/patches/204_CVE-2010-0408.dpatch: No longer needed.
    - debian/patches/205_CVE-2010-0434.dpatch: No longer needed.
    - debian/patches/203_fix-ab-segfault.dpatch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/proxy/NWGNUproxybalancer
209
209
FILES_nlm_Ximports = \
210
210
        @$(APR)/aprlib.imp \
211
211
        @$(NWOS)/httpd.imp \
 
212
        @$(OBJDIR)/mod_proxy.imp \
212
213
        @libc.imp \
213
 
        proxy_module \
214
 
        proxy_hook_scheme_handler \
215
 
        proxy_hook_canon_handler \
216
 
        proxy_hook_pre_request \
217
 
        proxy_hook_post_request \
218
 
        proxy_hook_load_lbmethods \
219
 
        proxy_run_fixups \
220
 
        ap_proxy_ssl_enable \
221
 
        ap_proxy_ssl_disable \
222
214
        $(EOLIST)
223
215
 
224
216
# Don't link with Winsock if standard sockets are being used