← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/lighttpd/oneiric

« back to all changes in this revision

Viewing changes to src/network.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-06-27 13:13:01 UTC
  • mfrom: (6.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100627131301-hno77ea67jxa6m1g
Tags: 1.4.26-3ubuntu1
https://launchpad.net/bugs/599010
https://launchpad.net/bugs/551211
* Merge from debian unstable (LP: #599010), remaining changes:
  - debian/control: 
    + libgamin-dev rather than libfam-dev to fix startup warning.
    + debhelper Build-depends bumped to (>= 7.0.50) for
      overrides in rules file. 
  - debian/lighttpd.init: clean environment; Check syntax during start/reload
    restart/force-reload.
  - debian/index.html: s/Debian/Ubuntu/g branding on the default page.
  - Added a UFW profile set:
    + debian/lighttpd.dirs: added etc/ufw/applications.d
    + debian/rules: install the ufw profile.
    + debian/control: Suggests on ufw.
  - Add lighttpd-dev package:
    + debian/control: Added lighttpd-dev package; Build-depends on
      automake, libtool
    + debian/lighttpd-dev.install: Added.
  - debian/rules:
    + Add override_dh_installinit to set "defaults 91 09" to not start
      before apache2 but in the same runlevel with the same priority.
  - debian/patches/build-dev-package.patch: Updated
  - debian/lighttpd.conf: Comment 'use-ipv6.pl' by default, which causes
    failure to bind port in ipv4 (LP: #551211)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/network.c
525
525
 
526
526
                if (!s->ssl_use_sslv2) {
527
527
                        /* disable SSLv2 */
528
 
                        if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
 
528
                        if(!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))){
529
529
                                log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
530
530
                                                ERR_error_string(ERR_get_error(), NULL));
531
531
                                return -1;