cvs: SVNROOT / TODO httpd.conf

gwynne		Thu Jul  9 19:21:35 2009 UTC

  Modified files:              
    /SVNROOT	TODO httpd.conf 
  Log:
  cosmetic fixes to httpd.conf, remove completed/outdated TODO stuff
  
http://cvs.php.net/viewvc.cgi/SVNROOT/TODO?r1=1.1&r2=1.2&diff_format=u
Index: SVNROOT/TODO
diff -u SVNROOT/TODO:1.1 SVNROOT/TODO:1.2
--- SVNROOT/TODO:1.1	Tue Jun 30 21:36:48 2009
+++ SVNROOT/TODO	Thu Jul  9 19:21:35 2009
@@ -1,4 +1 @@
 - pre-commit must check for tags/ branches/ trunk/ in creation of new modules (top-level, next-to-top-level, pear/packages/*, pecl/*)
-- pre-commit must deal with branching/tagging in php-src
-- pre-commit must disallow commits to */tags/*
-
http://cvs.php.net/viewvc.cgi/SVNROOT/httpd.conf?r1=1.9&r2=1.10&diff_format=u
Index: SVNROOT/httpd.conf
diff -u SVNROOT/httpd.conf:1.9 SVNROOT/httpd.conf:1.10
--- SVNROOT/httpd.conf:1.9	Thu Jul  9 19:00:47 2009
+++ SVNROOT/httpd.conf	Thu Jul  9 19:21:35 2009
@@ -3,6 +3,7 @@
     CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION
     CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 86400" combined
     ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400"
+
     ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
     ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
     Alias /docroot /home/svn/viewvc-svn/templates/docroot
@@ -16,6 +17,7 @@
         Order allow,deny
         Allow from all
     </Location>
+
     <Location "/repository">
         DAV svn
         SVNPath "/home/svn/repository"
@@ -32,23 +34,22 @@
 
 #NameVirtualHost *:443
 #<VirtualHost *:443>
-   # SSLEngine On
-   # SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-   # SSLCertificateFile /local/this-box/php.net.crt
-   # SSLCertificateKeyFile  /local/this-box/php.net.key
-   # ServerName svn.php.net
-   # CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION
-   # CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400" combined
-   # ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400"
-   # <Location "/">
-    ##    DAV svn
-    #    SVNPath "/home/svn/repository"
-    #    Satisfy All
-    #    Require valid-user
-    #    AuthType Digest
-    #    AuthName "PHP Subversion Repository"
-    #    AuthUserFile "/home/svn/SVNROOT/passwd.db"
-    #    AuthDigestDomain "/"
-   # </Location>
+#   SSLEngine On
+#   SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+#   SSLCertificateFile /local/this-box/php.net.crt
+#   SSLCertificateKeyFile  /local/this-box/php.net.key
+#   ServerName svn.php.net
+#   CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d 86400" "%t %u %{SVN-ACTION}e" env=SVN-ACTION
+#   CustomLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d 86400" combined
+#   ErrorLog "|/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d 86400"
+#   <Location "/">
+#       DAV svn
+#       SVNPath "/home/svn/repository"
+#       Satisfy All
+#       Require valid-user
+#       AuthType Digest
+#       AuthName "PHP Subversion Repository"
+#       AuthUserFile "/home/svn/SVNROOT/passwd.db"
+#       AuthDigestDomain "/"
+#   </Location>
 #</VirtualHost>
-