← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to Apache.dsw

  • 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:
Apache.dsw
249
249
    Project_Dep_Name mod_proxy_http
250
250
    End Project Dependency
251
251
    Begin Project Dependency
 
252
    Project_Dep_Name mod_reqtimeout
 
253
    End Project Dependency
 
254
    Begin Project Dependency
252
255
    Project_Dep_Name mod_rewrite
253
256
    End Project Dependency
254
257
    Begin Project Dependency
2181
2184
 
2182
2185
###############################################################################
2183
2186
 
 
2187
Project: "mod_reqtimeout"=.\modules\filters\mod_reqtimeout.dsp - Package Owner=<4>
 
2188
 
 
2189
Package=<5>
 
2190
{{{
 
2191
}}}
 
2192
 
 
2193
Package=<4>
 
2194
{{{
 
2195
    Begin Project Dependency
 
2196
    Project_Dep_Name libapr
 
2197
    End Project Dependency
 
2198
    Begin Project Dependency
 
2199
    Project_Dep_Name libaprutil
 
2200
    End Project Dependency
 
2201
    Begin Project Dependency
 
2202
    Project_Dep_Name libhttpd
 
2203
    End Project Dependency
 
2204
}}}
 
2205
 
 
2206
###############################################################################
 
2207
 
2184
2208
Project: "mod_rewrite"=.\modules\mappers\mod_rewrite.dsp - Package Owner=<4>
2185
2209
 
2186
2210
Package=<5>