← Back to branch summary

~ubuntu-branches/ubuntu/natty/apache2/natty

« back to all changes in this revision

Viewing changes to srclib/apr/test/testshm.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-06 00:29:03 UTC
  • mfrom: (14.3.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106002903-a7zl7sh2z1z3uxqb
Tags: 2.2.14-1ubuntu1
* Merge from debian testing, remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, pache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/conrol: Add bzr tag and point it to our tree.
  - Dropped debian/patches/203_fix_legacy_ap_rputs_segfaults.dpatch: 
    Already applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr/test/testshm.c
185
185
    rv = apr_procattr_create(&attr1, p);
186
186
    ABTS_PTR_NOTNULL(tc, attr1);
187
187
    APR_ASSERT_SUCCESS(tc, "Couldn't create attr1", rv);
 
188
 
 
189
    rv = apr_procattr_cmdtype_set(attr1, APR_PROGRAM_ENV);
 
190
    APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
 
191
 
188
192
    args[0] = apr_pstrdup(p, "testshmproducer" EXTENSION);
189
193
    args[1] = NULL;
190
194
    rv = apr_proc_create(&pidproducer, TESTBINPATH "testshmproducer" EXTENSION, args,
194
198
    rv = apr_procattr_create(&attr2, p);
195
199
    ABTS_PTR_NOTNULL(tc, attr2);
196
200
    APR_ASSERT_SUCCESS(tc, "Couldn't create attr2", rv);
 
201
 
 
202
    rv = apr_procattr_cmdtype_set(attr2, APR_PROGRAM_ENV);
 
203
    APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
 
204
 
197
205
    args[0] = apr_pstrdup(p, "testshmconsumer" EXTENSION);
198
206
    rv = apr_proc_create(&pidconsumer, TESTBINPATH "testshmconsumer" EXTENSION, args, 
199
207
                         NULL, attr2, p);