Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/proftpd/patches/proftpd-ioctl-s11.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Fri, 02 Aug 2013 11:53:04 -0700
branchs11-update
changeset 2712 45c3ae29a200
parent 838 e3efa8edf0c1
permissions -rw-r--r--
16555453 proftpd build fails if LOGNAME not in environment 16940924 svc:/network/ftp:default shouldn't depend explicitly on network/physical
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
838
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     1
 
--- a/src/inet.c
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     2
 
+++ b/src/inet.c
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     3
 
@@ -1238,7 +1238,7 @@ conn_t *pr_inet_openrw(pool *p, conn_t *c, pr_netaddr_t *addr, int strm_type,
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     4
 
   res->mode = CM_OPEN;
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     5
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     6
 
 #if defined(HAVE_STROPTS_H) && defined(I_SRDOPT) && defined(RPROTDIS) && \
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     7
 
-    defined(SOLARIS2)
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     8
 
+    defined(SOLARIS2) && !defined(SOLARIS2_11)
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
     9
 
   /* This is needed to work around control messages in STREAMS devices
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    10
 
    * (as on Solaris 9/NFS).
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    11
 
    */
e3efa8edf0c1 7149865 protftpd perfomance is unacceptable on Solaris
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff changeset 
    12
 














upstream/oracle/userland-gate