date:20030623

[PHP-CVS] cvs: php-src(PHP_5) / acinclude.m4

2003-06-23 Thread Jani Taskinen

sniper  Mon Jun 23 23:44:15 2003 EDT

  Modified files:  (Branch: PHP_5)
/php-srcacinclude.m4 
  Log:
  Moved PHP_SETUP_OPENSSL around. (closer to the other PHP_SETUP_* macros)
  
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.246.2.1 php-src/acinclude.m4:1.246.2.2
--- php-src/acinclude.m4:1.246.2.1  Mon Jun 23 23:41:36 2003
+++ php-src/acinclude.m4Mon Jun 23 23:44:15 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.246.2.1 2003/06/24 03:41:36 sniper Exp $
+dnl $Id: acinclude.m4,v 1.246.2.2 2003/06/24 03:44:15 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -177,81 +177,6 @@
   $1=[$]ac_new_flags
 ])
 
-dnl 
-dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
-dnl
-dnl Common setup macro for openssl
-dnl
-AC_DEFUN([PHP_SETUP_OPENSSL],[
-  found_openssl=no
-  unset OPENSSL_INCDIR
-  unset OPENSSL_LIBDIR
-
-  if test "$PHP_OPENSSL" = "yes"; then
-PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-  fi
-
-  for i in $PHP_OPENSSL; do
-if test -r $i/include/openssl/evp.h; then
-  OPENSSL_INCDIR=$i/include
-fi
-if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
-  OPENSSL_LIBDIR=$i/lib
-fi
-  done
-
-  if test -z "$OPENSSL_INCDIR"; then
-AC_MSG_ERROR([Cannot find OpenSSL's ])
-  fi
-
-  if test -z "$OPENSSL_LIBDIR"; then
-AC_MSG_ERROR([Cannot find OpenSSL's libraries])
-  fi
-
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=-I$OPENSSL_INCDIR
-  AC_MSG_CHECKING([for OpenSSL version])
-  AC_EGREP_CPP(yes,[
-#include 
-#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
-  yes
-#endif
-  ],[
-AC_MSG_RESULT([>= 0.9.6])
-  ],[
-AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
-  ])
-  CPPFLAGS=$old_CPPFLAGS
-
-  PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
-PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
-  found_openssl=yes
-], [
-  AC_MSG_ERROR([libssl not found!])
-],[
-  -L$OPENSSL_LIBDIR
-])
-  ], [
-AC_MSG_ERROR([libcrypto not found!])
-  ],[
--L$OPENSSL_LIBDIR
-  ])
-
-  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
-  AC_SUBST(OPENSSL_INCDIR_OPT)
-
-  if test "$found_openssl" = "yes"; then
-if test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR"; then
-  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
-  PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
-  PHP_ADD_LIBRARY(crypto,,$1)
-  PHP_ADD_LIBRARY(ssl,, $1)
-fi
-$2
-ifelse([$3],[],,[else $3])
-  fi
-])
-
 dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
 dnl
 dnl Use this macro, if you need to add libraries and or library search
@@ -1637,6 +1562,81 @@
 LDFLAGS=$save_old_LDFLAGS
 $4
   ])
+])
+
+dnl 
+dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
+dnl
+dnl Common setup macro for openssl
+dnl
+AC_DEFUN([PHP_SETUP_OPENSSL],[
+  found_openssl=no
+  unset OPENSSL_INCDIR
+  unset OPENSSL_LIBDIR
+
+  if test "$PHP_OPENSSL" = "yes"; then
+PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+  fi
+
+  for i in $PHP_OPENSSL; do
+if test -r $i/include/openssl/evp.h; then
+  OPENSSL_INCDIR=$i/include
+fi
+if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+  OPENSSL_LIBDIR=$i/lib
+fi
+  done
+
+  if test -z "$OPENSSL_INCDIR"; then
+AC_MSG_ERROR([Cannot find OpenSSL's ])
+  fi
+
+  if test -z "$OPENSSL_LIBDIR"; then
+AC_MSG_ERROR([Cannot find OpenSSL's libraries])
+  fi
+
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=-I$OPENSSL_INCDIR
+  AC_MSG_CHECKING([for OpenSSL version])
+  AC_EGREP_CPP(yes,[
+#include 
+#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
+  yes
+#endif
+  ],[
+AC_MSG_RESULT([>= 0.9.6])
+  ],[
+AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
+  ])
+  CPPFLAGS=$old_CPPFLAGS
+
+  PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
+PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
+  found_openssl=yes
+], [
+  AC_MSG_ERROR([libssl not found!])
+],[
+  -L$OPENSSL_LIBDIR
+])
+  ], [
+AC_MSG_ERROR([libcrypto not found!])
+  ],[
+-L$OPENSSL_LIBDIR
+  ])
+
+  OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
+  AC_SUBST(OPENSSL_INCDIR_OPT)
+
+  if test "$found_openssl" = "yes"; then
+if test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR"; then
+  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
+  PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
+  PHP_ADD_LIBRARY(crypto,,$1)
+  PHP_ADD_LIBRARY(ssl,, $1)
+fi
+$2
+ifelse([$3],[],,[else $3])
+  fi
 ])
 
 dnl 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5) / acinclude.m4 configure.in /ext/openssl config.m4 config0.m4 /ext/snmp config.m4 /scripts phpize.m4

2003-06-23 Thread Jani Taskinen

sniper  Mon Jun 23 23:41:37 2003 EDT

  Added files: (Branch: PHP_5)
/php-src/ext/opensslconfig0.m4 

  Removed files:   
/php-src/ext/opensslconfig.m4 

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/ext/snmp   config.m4 
/php-src/scriptsphpize.m4 
  Log:
  Synced PHP_SETUP_OPENSSL with PHP_SETUP_ICONV and PHP_SETUP_LIBXML macros.
  
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.246 php-src/acinclude.m4:1.246.2.1
--- php-src/acinclude.m4:1.246  Sun Jun  8 20:17:03 2003
+++ php-src/acinclude.m4Mon Jun 23 23:41:36 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.246 2003/06/09 00:17:03 sniper Exp $
+dnl $Id: acinclude.m4,v 1.246.2.1 2003/06/24 03:41:36 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -177,7 +177,16 @@
   $1=[$]ac_new_flags
 ])
 
+dnl 
+dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
+dnl
+dnl Common setup macro for openssl
+dnl
 AC_DEFUN([PHP_SETUP_OPENSSL],[
+  found_openssl=no
+  unset OPENSSL_INCDIR
+  unset OPENSSL_LIBDIR
+
   if test "$PHP_OPENSSL" = "yes"; then
 PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
   fi
@@ -214,27 +223,33 @@
   ])
   CPPFLAGS=$old_CPPFLAGS
 
-  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
-  PHP_ADD_LIBPATH($OPENSSL_LIBDIR)
-
   PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
-PHP_ADD_LIBRARY(crypto)
-  ],[
+PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
+  found_openssl=yes
+], [
+  AC_MSG_ERROR([libssl not found!])
+],[
+  -L$OPENSSL_LIBDIR
+])
+  ], [
 AC_MSG_ERROR([libcrypto not found!])
   ],[
 -L$OPENSSL_LIBDIR
   ])
 
-  PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
-PHP_ADD_LIBRARY(ssl)
-  ],[
-AC_MSG_ERROR([libssl not found!])
-  ],[
--L$OPENSSL_LIBDIR
-  ])
-
   OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
   AC_SUBST(OPENSSL_INCDIR_OPT)
+
+  if test "$found_openssl" = "yes"; then
+if test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR"; then
+  PHP_ADD_INCLUDE($OPENSSL_INCDIR)
+  PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
+  PHP_ADD_LIBRARY(crypto,,$1)
+  PHP_ADD_LIBRARY(ssl,, $1)
+fi
+$2
+ifelse([$3],[],,[else $3])
+  fi
 ])
 
 dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)
Index: php-src/configure.in
diff -u php-src/configure.in:1.448 php-src/configure.in:1.448.2.1
--- php-src/configure.in:1.448  Mon Jun 23 12:06:37 2003
+++ php-src/configure.inMon Jun 23 23:41:36 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.448 2003/06/23 16:06:37 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.448.2.1 2003/06/24 03:41:36 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -731,18 +731,6 @@
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
   AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
-fi
-
-
-dnl
-dnl OpenSSL configure
-dnl
-PHP_ARG_WITH(openssl,for OpenSSL support,
-[  --with-openssl[=DIR]Include OpenSSL support (requires OpenSSL >= 0.9.6) ])
-
-if test "$PHP_OPENSSL" != "no"; then
-  ext_openssl_shared=$ext_shared
-  PHP_SETUP_OPENSSL
 fi
 
 divert(5)
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.29 php-src/ext/snmp/config.m4:1.29.2.1
--- php-src/ext/snmp/config.m4:1.29 Mon Feb 17 17:45:50 2003
+++ php-src/ext/snmp/config.m4  Mon Jun 23 23:41:36 2003
@@ -1,10 +1,13 @@
 dnl
-dnl $Id: config.m4,v 1.29 2003/02/17 22:45:50 sniper Exp $
+dnl $Id: config.m4,v 1.29.2.1 2003/06/24 03:41:36 sniper Exp $
 dnl
 
 PHP_ARG_WITH(snmp,for SNMP support,
 [  --with-snmp[=DIR]   Include SNMP support.])
 
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[  --with-openssl-dir[=DIR]  SNMP: openssl install prefix.], no, no)
+
 if test "$PHP_SNMP" != "no"; then
 
   dnl
@@ -77,13 +80,18 @@
 AC_MSG_RESULT($SNMP_SSL)
   
 if test "$SNMP_SSL" = "yes"; then
-  if test "$PHP_OPENSSL" != "no"; then
-PHP_ADD_LIBRARY(ssl,   1, SNMP_SHARED_LIBADD)
-PHP_ADD_LIBRARY(crypto,1, SNMP_SHARED_LIBADD)
-  else
-AC_MSG_ERROR(The UCD-SNMP in this system is built with SSL support. 
+  if test "$PHP_OPENSSL_DIR" != "no"; then
+PHP_OPENSSL=$PHP_OPENSSL_DIR
+  fi
+  
+  if test "$PHP_OPENSSL" = "no"; then
+AC_MSG_ERROR([The UCD-SNMP in this system is built with SSL support. 
 
-Add --with-openssl<=DIR> to your configure line.)
+Add --with-openssl-dir=DIR to your configure line.])
+  else
+PHP_SETUP_OPENSSL(SNMP_SHARED_LIBADD, [], [
+  AC_MSG_ERROR([SNMP: OpenSSL check failed. Please check config.log for more 
information.])
+])
   fi
 fi
 
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.2 php-src/scripts/phpize.m4:1.2.2.1
--- php-src/scripts/phpize.m4:1.2   Sun May 18 21:44:40 2003
+++ php-src/scripts/phpize.m4   Mon Jun 23 23:41:36 2003
@@ -52,18 +52,6 @@
 
 AC_PREF

[PHP-CVS] cvs: CVSROOT / avail

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 23:40:16 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  replace php4 and php5 with php-src
  
  Index: CVSROOT/avail
diff -u CVSROOT/avail:1.695 CVSROOT/avail:1.696
--- CVSROOT/avail:1.695 Sun Jun 22 20:33:46 2003
+++ CVSROOT/avail   Mon Jun 23 23:40:16 2003
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP and PEAR, as well as the documentation.
 
-avail|rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php4,php5,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el
+avail|rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el
 
 
 # People who work on the Engine
@@ -47,7 +47,7 @@
 
 
avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill|pear,peardoc
 
-avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz|php4/pear
+avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz|php-src/pear
 
avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz|pearweb
 
avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews
 
@@ -80,7 +80,7 @@
 # Some CVS modules have a ChangeLog file that is automatically updated
 # by a program that commits as user 'changelog'.
 
-avail|changelog|php4,php5,php-gtk,Zend,ZendEngine2,smarty
+avail|changelog|php-src,php-gtk,Zend,ZendEngine2,smarty
 
 # Some people have access to change the day-to-day code on the various php.net 
machines
 avail|imajes,edink,derick,sfox,wez|systems
@@ -93,80 +93,80 @@
 avail|hholzgra,stas|functable
 avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla
 avail|jmoore,alan_k|php-gtk/generator
-avail|sterling|php4/ext/bz2
-avail|tal|php4/ext/fribidi
-avail|bmcadams|php4/ext/ccvs
-avail|phanto,abrown|php4/ext/com
-avail|steinm|php4/ext/cpdf
-avail|hholzgra|php4/ext/ctype
-avail|sterling|php4/ext/curl
-avail|evan|php4/ext/cybercash
-avail|spages|php4/ext/cybermut
-avail|steinm,jarkol,zenderx,chregu,jtate,thoralf|php4/ext/domxml
-avail|steinm|php4/ext/fdf
-avail|alan_k|php4/ext/dio
-avail|chad,sesser|php4/ext/filepro
-avail|askalski|php4/ext/ftp
-avail|jah,ttoohey,pajoye|

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 23:04:13 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  sync with locally edited version
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.50 CVSROOT/modules:1.51
--- CVSROOT/modules:1.50Mon Jun 23 21:16:47 2003
+++ CVSROOT/modules Mon Jun 23 23:04:13 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.50 2003/06/24 01:16:47 imajes Exp 
$"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.51 2003/06/24 03:04:13 sas Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -34,8 +34,13 @@
 # Modules to be seen by Bonsai
 ze2-dir -d Zend ZendEngine2
 
-php-src-ze1 -d php-src &php-src &Zend
-php-src-ze2 -d php-src &php-src &ze2-dir
+# what it should become:
+#php-src php-src &TSRM &Zend &ZendEngine2
+#php-src-ze1 -a php-src
+#php-src-ze2 -a php-s
+
+php-src-ze1 -d php-src php-src &TSRM &Zend
+php-src-ze2 -d php-src php-src &TSRM &ze2-dir
 
 phpweb phpweb
 pear pear



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5) / NEWS

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 22:02:01 2003 EDT

  Modified files:  (Branch: PHP_5)
/php-srcNEWS 
  Log:
  test commit
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1426 php-src/NEWS:1.1426.2.1
--- php-src/NEWS:1.1426 Mon Jun 16 15:58:24 2003
+++ php-src/NEWSMon Jun 23 22:02:00 2003
@@ -2,7 +2,7 @@
 |||
 ? ? ??? 200?, Version 5.0.0
 
-## Note the changed grouping. Try add your entries to appropriate places
+## Note the changed grouping. Try add your entries to appropriate places 
 ## to enhance the readability of this file. Using @ is discouraged.
 ## (This file will be cleaned up before release.)
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread James Cox

imajes  Mon Jun 23 21:16:49 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  Make TSRM appear in checkouts of php-src.
  
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.49 CVSROOT/modules:1.50
--- CVSROOT/modules:1.49Mon Jun 23 19:43:14 2003
+++ CVSROOT/modules Mon Jun 23 21:16:47 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.49 2003/06/23 23:43:14 sas Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.50 2003/06/24 01:16:47 imajes Exp 
$"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -34,8 +34,8 @@
 # Modules to be seen by Bonsai
 ze2-dir -d Zend ZendEngine2
 
-php-src-ze1 -d php-src php-src &Zend
-php-src-ze2 -d php-src php-src &ze2-dir
+php-src-ze1 -d php-src &php-src &Zend
+php-src-ze2 -d php-src &php-src &ze2-dir
 
 phpweb phpweb
 pear pear



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 21:03:07 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  Test commit
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.263 php-src/NEWS:1.1247.2.264
--- php-src/NEWS:1.1247.2.263   Sun Jun 22 12:48:16 2003
+++ php-src/NEWSMon Jun 23 21:03:07 2003
@@ -1,5 +1,6 @@
 PHP 4  NEWS
 |||
+
 26 Jun 2003, Version 4.3.3RC2
 - Fixed bug #24284 (Fixed memory leak inside pg_ping()). (Ilia)
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 19:43:14 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  Drop module aliases in favor of symlinks inside the repository for the
  following reasons:
  
  - symlinks are much more transparent to the repository users
  - symlinked directories are seen by "cvs update -d"
whereas module aliases are only considered during "cvs checkout"
  
  However, there is one huge disadvantage:
  
  - setting up symlinks requires root access on the server, and thus
cannot be handled entirely using the CVS command.
  
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.48 CVSROOT/modules:1.49
--- CVSROOT/modules:1.48Mon Jun 23 18:54:10 2003
+++ CVSROOT/modules Mon Jun 23 19:43:14 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.48 2003/06/23 22:54:10 sas Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.49 2003/06/23 23:43:14 sas Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -44,12 +44,7 @@
 php-gtk php-gtk
 php-gtk-doc php-gtk-doc
 
-bz2-dir -d ext/bz2 pecl/bz2
-mono-dir -d ext/mono pecl/mono
-simplexml-dir -d ext/simplexml pecl/simplexml
-sqlite-dir -d ext/sqlite pecl/sqlite
-
-php-src php-src &TSRM &bz2-dir &mono-dir &simplexml-dir &sqlite-dir
+php-src php-src &TSRM 
 
 Zend Zend
 ZendEngine2 ZendEngine2



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 18:54:10 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  Refactor entries and add various pecl dirs
  
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.47 CVSROOT/modules:1.48
--- CVSROOT/modules:1.47Mon Jun 23 18:09:37 2003
+++ CVSROOT/modules Mon Jun 23 18:54:10 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.47 2003/06/23 22:09:37 sas Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.48 2003/06/23 22:54:10 sas Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -34,8 +34,8 @@
 # Modules to be seen by Bonsai
 ze2-dir -d Zend ZendEngine2
 
-php-src-ze1 -d php-src php-src &Zend &TSRM
-php-src-ze2 -d php-src php-src &ze2-dir &TSRM
+php-src-ze1 -d php-src php-src &Zend
+php-src-ze2 -d php-src php-src &ze2-dir
 
 phpweb phpweb
 pear pear
@@ -44,7 +44,13 @@
 php-gtk php-gtk
 php-gtk-doc php-gtk-doc
 
-php-src php-src
+bz2-dir -d ext/bz2 pecl/bz2
+mono-dir -d ext/mono pecl/mono
+simplexml-dir -d ext/simplexml pecl/simplexml
+sqlite-dir -d ext/sqlite pecl/sqlite
+
+php-src php-src &TSRM &bz2-dir &mono-dir &simplexml-dir &sqlite-dir
+
 Zend Zend
 ZendEngine2 ZendEngine2
 TSRM TSRM



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: spl / README

2003-06-23 Thread Marcus Boerger

helly   Mon Jun 23 18:37:13 2003 EDT

  Modified files:  
/splREADME 
  Log:
  Put some brief technically description here
  
Index: spl/README
diff -u spl/README:1.2 spl/README:1.3
--- spl/README:1.2  Sat May 24 09:47:49 2003
+++ spl/README  Mon Jun 23 18:37:12 2003
@@ -1,36 +1,88 @@
 This is an extension that aims to implement some efficient data access 
-interfaces and classes.
+interfaces and classes. You'll find the classes documented using php
+code in the file spl.php.
 
-SPL allows to hook into foreach. Doing so you can do something like
-this:
-
-   $obj = new whatever();
-   foreach($obj as $key => $value) { ... }
-
-This is meant to be used for database access. For example you could
-grab my patch to sqlite (http://marcus-boerger.de/php/ext/sqlite/";>http://marcus-boerger.de/php/ext/sqlite/)
 and
-look at the oo tests:
-
-   $db = new sqlite($filename);
-   foreach($db->query("SELECT") as $row) { ... }
-
-SQLite offers four access strategies:
-1) sqlite_query + sqlite_fetch_array
-2) sqlite_unbuffered_query + sqlite_fetch_array
-3) sqlite_query + iterators (sqlite_current)
-4) sqlite_unbuffered_query + iterators (sqlite_current)
-
-1) and 3) do "over eager evaluating" since they fetch all rows directly.
-
-2) does "eager evaluating". It always fetches the next row but doesn't 
-keep the current row, so that it must be stored elsewhere if it must be 
-accessed more then once. For instance this happens when you need to access 
-columns separately.
-
-4) does "eager evaluating". But in contrast to 2) it keeps the current row
-hence its name.
-
-There is no efficient way for "lazy or just in time evaluating" so 4) should 
-be the best case. And 4) also enables the foreach trick.
-
-To implement 3) and 4) with other db extensions ask me and wait for LT to pass.
+There are special SPL interfaces that provides the ability to hook into 
+foreach and array reading/writng. By inheriting these interfaces, instances 
+of the resulting classes can be iterated using the foreach construct or
+use array read write notation.
+
+Look into the examples subdirectory for some basic examples which will
+demonstracte this.
+
+Also some classes of extensions like SQLite inherit SPL interfaces so that
+they take advantage of the foreach or array overloading.
+
+1) Iterators
+
+Iterator is design pattern that allows to enumerate and list all elements of 
+a collection whatsoever using an oo protocol. The minimalistic Iterator needs
+a method that returns the current value, a method that moves to the next value
+and a method that checks whether or not the Iterator can provide more elements.
+
+In SPL this basich Iterator is defined by the interface spl_forward:
+
+interface spl_forward {
+   function current();
+   function next();
+   function has_more();
+}
+
+This basic Iterator does not allow to rewind itself nor does it in anyway 
+support to name the values by some kind association as key/value mappings
+provided by the standard PHP arrays. All these additions to the basic Iterator
+are done in specialized interfaces as described in detail in the file spl.php.
+
+SPL allows to hook into the engine opcodes that realize the foreach construct.
+This construct normally works on arrays the following way. First it rewinds 
+the current array position to the beginning. Then it loops through the whole
+array by first checking whether or not the end of the array is reached and
+if not returning the current array value and or key. After that it move the
+current array pointer forward and does starts the loop process again. As you 
+can see this perfectly maps to the interface spl_forward. So the foreach
+hooking simply checks whether or not the variable passed to foreach is an
+object of a class implementing the interface spl_forward. The foreach hook
+can be activated by --enable-spl-foreach which is on by default.
+
+class it implements spl_forward...
+$obj = new it();
+foreach($obj as $value) ...
+
+2) Arrays
+
+Arrays in general, not specifically PHP arrays, provide a collection of pairs
+normally referred to as key and value. A PHP object consists of properties and
+a class type specifing the methods available for the object. SPL now allows
+this to be combined using the spl_array_ interfaces.
+
+The minimalistic array interface is spl_array_read which only support reading:
+
+interface spl_array_read {
+   function exists($key);
+   function get($key);
+}
+
+Any instance of a class that implements spl_array_read can be used with array
+read notation when the corresponding hook is activated --enable-spl-array-read.
+
+class ar implements spl_array_read...
+$obj = new ar();
+$value = $obj[$key];
+
+SPL also supports the write notation by the interface spl_array_access:
+
+interface spl_array_access extends spl_array_read {
+   function set($value, $index);
+}
+
+When the array write hook is activated by --enable-spl-array-write the 
+following

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 18:09:37 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  php4-only etc. don't serve any purpose.
  
  if you want the pure php-src module, just use php-src.
  
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.46 CVSROOT/modules:1.47
--- CVSROOT/modules:1.46Mon Jun 23 18:06:56 2003
+++ CVSROOT/modules Mon Jun 23 18:09:37 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.46 2003/06/23 22:06:56 sas Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.47 2003/06/23 22:09:37 sas Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -32,19 +32,10 @@
 #world -a .
 
 # Modules to be seen by Bonsai
-php4-only php4-dir
-php5-only php5-dir
-
-php4-dir -d php4 php-src
-php5-dir -d php5 php-src
 ze2-dir -d Zend ZendEngine2
 
 php-src-ze1 -d php-src php-src &Zend &TSRM
 php-src-ze2 -d php-src php-src &ze2-dir &TSRM
-
-# disabled on purpose. contact sascha if you want to change
-#php4 php4-dir &Zend &TSRM
-#php5 php5-dir &ze2-dir &TSRM 
 
 phpweb phpweb
 pear pear



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: CVSROOT / modules

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 18:06:56 2003 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  Commit local changes
  
  
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.45 CVSROOT/modules:1.46
--- CVSROOT/modules:1.45Sun Jun 22 20:46:27 2003
+++ CVSROOT/modules Mon Jun 23 18:06:56 2003
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.45 2003/06/23 00:46:27 imajes Exp 
$"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.46 2003/06/23 22:06:56 sas Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -32,22 +32,36 @@
 #world -a .
 
 # Modules to be seen by Bonsai
-php4-only php4
-php5-only php5
-php4 php4 &Zend &TSRM
+php4-only php4-dir
+php5-only php5-dir
+
+php4-dir -d php4 php-src
+php5-dir -d php5 php-src
 ze2-dir -d Zend ZendEngine2
-php5 php5 &ze2-dir &TSRM 
-#php3 php3
+
+php-src-ze1 -d php-src php-src &Zend &TSRM
+php-src-ze2 -d php-src php-src &ze2-dir &TSRM
+
+# disabled on purpose. contact sascha if you want to change
+#php4 php4-dir &Zend &TSRM
+#php5 php5-dir &ze2-dir &TSRM 
+
 phpweb phpweb
 pear pear
 pearweb pearweb
+
 php-gtk php-gtk
 php-gtk-doc php-gtk-doc
+
+php-src php-src
 Zend Zend
 ZendEngine2 ZendEngine2
 TSRM TSRM
+php3 php3
+
 #D phpdoc  PHP
 #M phpdoc  PHP
+
 
 # phpdoc is just the english version and the build structure
 phpdoc phpdoc



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: spl / README.PROFILING

2003-06-23 Thread Marcus Boerger

helly   Mon Jun 23 17:59:55 2003 EDT

  Added files: 
/splREADME.PROFILING 
  Log:
  Add profiling results
  

Index: spl/README.PROFILING
+++ spl/README.PROFILING
SQLite is the first extension that makes use of SPL automatically by simply
enabling both.

SQLite offers four access strategies:
1) sqlite_query + sqlite_fetch_array
2) sqlite_unbuffered_query + sqlite_fetch_array
3) sqlite_query + iterators (sqlite_current)
4) sqlite_unbuffered_query + iterators (sqlite_current)
5) sqlite_array_query

1) and 3) do "over eager evaluating" since they fetch all rows directly.

2) does "eager evaluating". It always fetches the next row but doesn't 
keep the current row, so that it must be stored elsewhere if it must be 
accessed more then once. For instance this happens when you need to access 
columns separately.

4) does "eager evaluating". But in contrast to 2) it keeps the current row
hence its name.

There is no efficient way for "lazy or just in time evaluating" so 4) should 
be the best case. And 4) also enables the foreach trick.

5) does a full buffered fetch and returns the complete result into an array.
As long as you only have a few rows in your result this is very fast and of
course it is very flexible since you can access any column/row as often you
like and in any order you like. But it needs to store the full result what
is called "eager evaluating".

Speedwise analysis:

I compared a database using a table of round about 200 rows with 3 columns.
I measured the case where 10 rows are returned, since i guess this is a 
value often taken as default list size in web applications. However i did
that 10 times because the loop initialization is the slowest part of foreach
overloading. Since we are only interested in the relative effect foreach 
overloading has i stiped the setup part and used a query result iteration 
that does nothing. That means i run 'php -h' in the profiler first and then 
profiled every single case. For completeness i also computed the values 
including the setup process.

Method,  without setup,  with setup
1)  100.00%100.00%
2)   89.32% 97.16%
3)   88.35% 96.90%

Furthermore i did some more checks and found out that the loop process using
foreach overloading (2) takes a constant time while it seems that the time 
needed to add more rows to the array increases with the number of rows being
already in the array. As a result (2) is faster than (3) after round about 45 
rows.

The loop codes used:

1)  Unbuffered query

unbuffered_query("SELECT idx, name, size from files LIMIT 10", 
SQLITE_NUM);
while ($res->has_more()) {
//  var_dump($res->current());
$res->current();
$res->next();
}
}
echo "DONE!\n";
?>

2) Unbuffered query using foreach overloading

unbuffered_query("SELECT idx, name, size from files LIMIT 10", 
SQLITE_NUM) as $row) {
//  var_dump($row);
}
}
echo "DONE!\n";
?>

3) Array query method

array_query("SELECT idx, name, size from files LIMIT 10", 
SQLITE_NUM) as  $row)  {
//  var_dump($row);
}
}
echo "DONE!\n";
?>


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4) /ext/standard/tests/file bug21131.phpt /pear pear.m4 /pear/packages Mail-1.0.1.tar Net_SMTP-1.0.tar XML_Parser-1.0.tar /pear/scripts php-config.in phpextdist phpize.in /scripts config-stubs conv_proto conv_z_macros credits /win32 php5ts.dsw

2003-06-23 Thread Sascha Schumann

sas Mon Jun 23 17:56:29 2003 EDT

  Removed files:   (Branch: PHP_4)
/php-src/ext/standard/tests/filebug21131.phpt 
/php-src/pear   pear.m4 
/php-src/pear/packages  Mail-1.0.1.tar Net_SMTP-1.0.tar 
XML_Parser-1.0.tar 
/php-src/pear/scripts   php-config.in phpextdist phpize.in 
/php-src/scriptsconfig-stubs conv_proto conv_z_macros credits 
/php-src/win32  php5ts.dsw 
  Log:
  Remove some old entries which were unaffected by moving the branch tag
  
  



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/snmp snmp.c

2003-06-23 Thread Harrie Hazewinkel

harrie  Mon Jun 23 14:16:37 2003 EDT

  Modified files:  
/php4/ext/snmp  snmp.c 
  Log:
  Cleaning up some very old definitions of version 3.3.1 until 3.5.3.
  Those versions are that old that people better upgrade the SNMP libraries.
  
  
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.78 php4/ext/snmp/snmp.c:1.79
--- php4/ext/snmp/snmp.c:1.78   Mon Jun 23 14:02:03 2003
+++ php4/ext/snmp/snmp.cMon Jun 23 14:16:37 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.78 2003/06/23 18:02:03 harrie Exp $ */
+/* $Id: snmp.c,v 1.79 2003/06/23 18:16:37 harrie Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -102,12 +102,6 @@
 /* For really old ucd-snmp versions.. */
 #ifndef HAVE_SNMP_PARSE_OID
 #define snmp_parse_oid read_objid
-#endif
-
-/* ucd-snmp 3.3.1 changed the name of a few #defines... They've been changed back to 
the original ones in 3.5.3! */
-#ifndef SNMP_MSG_GET
-#define SNMP_MSG_GET GET_REQ_MSG
-#define SNMP_MSG_GETNEXT GETNEXT_REQ_MSG
 #endif
 
 #define SNMP_VALUE_LIBRARY 0



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/snmp php_snmp.h snmp.c

2003-06-23 Thread Harrie Hazewinkel

harrie  Mon Jun 23 14:02:03 2003 EDT

  Modified files:  
/php4/ext/snmp  php_snmp.h snmp.c 
  Log:
  Applying the contributed patch of Johan Hanne.
  The patch enables control on the way the values are returned
  into the PHP script, instaed of always strings. Also the 
  type of the value is now returned when configured to do so.
  This enables better management scripts to do more automatic
  processing and value calculations.
  (By default the values are returned as strings, as was before)
  
  
  Index: php4/ext/snmp/php_snmp.h
diff -u php4/ext/snmp/php_snmp.h:1.18 php4/ext/snmp/php_snmp.h:1.19
--- php4/ext/snmp/php_snmp.h:1.18   Tue Jun 10 16:03:36 2003
+++ php4/ext/snmp/php_snmp.hMon Jun 23 14:02:03 2003
@@ -16,10 +16,11 @@
   |  Mike Jackson <[EMAIL PROTECTED]>|
   |  Steven Lawrance <[EMAIL PROTECTED]>|
   |  Harrie Hazewinkel <[EMAIL PROTECTED]>  |
+  |  Johann Hanne <[EMAIL PROTECTED]> |
   +--+
 */
 
-/* $Id: php_snmp.h,v 1.18 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: php_snmp.h,v 1.19 2003/06/23 18:02:03 harrie Exp $ */
 
 #ifndef PHP_SNMP_H
 #define PHP_SNMP_H
@@ -33,6 +34,10 @@
 extern zend_module_entry snmp_module_entry;
 #define snmp_module_ptr &snmp_module_entry
 
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
 PHP_MINIT_FUNCTION(snmp);
 PHP_MINFO_FUNCTION(snmp);
 
@@ -49,6 +54,19 @@
 PHP_FUNCTION(snmp3_walk);
 PHP_FUNCTION(snmp3_real_walk);
 PHP_FUNCTION(snmp3_set);
+
+PHP_FUNCTION(snmp_set_valueretrieval);
+PHP_FUNCTION(snmp_get_valueretrieval);
+
+ZEND_BEGIN_MODULE_GLOBALS(snmp)
+  int valueretrieval;
+ZEND_END_MODULE_GLOBALS(snmp)
+
+#ifdef ZTS
+#define SNMP_G(v) TSRMG(snmp_globals_id, zend_snmp_globals *, v)
+#else
+#define SNMP_G(v) (snmp_globals.v)
+#endif
 
 #else
 
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.77 php4/ext/snmp/snmp.c:1.78
--- php4/ext/snmp/snmp.c:1.77   Tue Jun 10 16:03:36 2003
+++ php4/ext/snmp/snmp.cMon Jun 23 14:02:03 2003
@@ -16,10 +16,11 @@
|  Mike Jackson <[EMAIL PROTECTED]>|
|  Steven Lawrance <[EMAIL PROTECTED]>|
|  Harrie Hazewinkel <[EMAIL PROTECTED]>  |
+   |  Johann Hanne <[EMAIL PROTECTED]> |
+--+
  */
 
-/* $Id: snmp.c,v 1.77 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: snmp.c,v 1.78 2003/06/23 18:02:03 harrie Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -109,6 +110,12 @@
 #define SNMP_MSG_GETNEXT GETNEXT_REQ_MSG
 #endif
 
+#define SNMP_VALUE_LIBRARY 0
+#define SNMP_VALUE_PLAIN   1
+#define SNMP_VALUE_OBJECT  2
+
+ZEND_DECLARE_MODULE_GLOBALS(snmp)
+
 /* constant - can be shared among threads */
 static oid objid_mib[] = {1, 3, 6, 1, 2, 1};
 
@@ -131,6 +138,8 @@
PHP_FE(snmp3_walk, NULL)
PHP_FE(snmp3_real_walk, NULL)
PHP_FE(snmp3_set, NULL)
+   PHP_FE(snmp_set_valueretrieval, NULL)
+   PHP_FE(snmp_get_valueretrieval, NULL)
{NULL,NULL,NULL}
 };
 /* }}} */
@@ -157,11 +166,39 @@
 
 /* THREAD_LS snmp_module php_snmp_module; - may need one of these at some point */
 
+/* {{{ php_snmp_init_globals
+ */
+static void php_snmp_init_globals(zend_snmp_globals *snmp_globals)
+{
+   snmp_globals->valueretrieval = 0;
+}
+/* }}} */
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(snmp)
 {
init_snmp("snmpapp");
+
+   ZEND_INIT_MODULE_GLOBALS(snmp, php_snmp_init_globals, NULL);
+
+   REGISTER_LONG_CONSTANT("SNMP_VALUE_LIBRARY", SNMP_VALUE_LIBRARY, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_VALUE_PLAIN", SNMP_VALUE_PLAIN, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_VALUE_OBJECT", SNMP_VALUE_OBJECT, CONST_CS | 
CONST_PERSISTENT);
+
+   REGISTER_LONG_CONSTANT("SNMP_BIT_STR", ASN_BIT_STR, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_OCTET_STR", ASN_OCTET_STR, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_OPAQUE", ASN_OPAQUE, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_NULL", ASN_NULL, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_OBJECT_ID", ASN_OBJECT_ID, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_IPADDRESS", ASN_IPADDRESS, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_COUNTER", ASN_GAUGE, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_UNSIGNED", ASN_UNSIGNED, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_TIMETICKS", ASN_TIMETICKS, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_UINTEGER", ASN_UINTEGER, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT("SNMP_INTEGER", ASN_INTEGER, CONS

[PHP-CVS] cvs: php5 / configure.in

2003-06-23 Thread Wez Furlong

wez Mon Jun 23 12:06:38 2003 EDT

  Modified files:  
/php5   configure.in 
  Log:
  Fix build when builddir != srcdir.
  
  
Index: php5/configure.in
diff -u php5/configure.in:1.447 php5/configure.in:1.448
--- php5/configure.in:1.447 Mon Jun 16 04:32:35 2003
+++ php5/configure.in   Mon Jun 23 12:06:37 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.447 2003/06/16 08:32:35 stas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.448 2003/06/23 16:06:37 wez Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1152,7 +1152,7 @@
 
 PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
 
-PHP_ADD_BUILD_DIR(main)
+PHP_ADD_BUILD_DIR(main main/streams)
 PHP_ADD_BUILD_DIR(regex)
 PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)
 PHP_ADD_BUILD_DIR(TSRM)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php5 /ext/standard/tests/strings bug24281.phpt

2003-06-23 Thread Stanislav Malyshev

stasMon Jun 23 10:18:33 2003 EDT

  Added files: 
/php5/ext/standard/tests/stringsbug24281.phpt 
  Log:
  add test for #24281   
  
  

Index: php5/ext/standard/tests/strings/bug24281.phpt
+++ php5/ext/standard/tests/strings/bug24281.phpt
--TEST--
Bug #24281: str_replace count not returned if variable wasn't initialized 
--SKIPIF--

--FILE--

--EXPECT--
3 changes were made.
3 changes were made.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php5 /ext/standard string.c

2003-06-23 Thread Stanislav Malyshev

stasMon Jun 23 10:09:15 2003 EDT

  Modified files:  
/php5/ext/standard  string.c 
  Log:
  Fix #24281 - str_replace not updating the count if value is
  not initialized
  
  
Index: php5/ext/standard/string.c
diff -u php5/ext/standard/string.c:1.391 php5/ext/standard/string.c:1.392
--- php5/ext/standard/string.c:1.391Fri Jun 20 11:41:43 2003
+++ php5/ext/standard/string.c  Mon Jun 23 10:09:14 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.391 2003/06/20 15:41:43 pollita Exp $ */
+/* $Id: string.c,v 1.392 2003/06/23 14:09:14 stas Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -3194,7 +3194,8 @@
php_str_replace_in_subject(*search, *replace, subject, return_value, 
case_sensitivity, (argc > 3) ? &count : NULL);
}   
if (argc > 3) {
-   Z_LVAL_PP(zcount) = count;
+   zval_dtor(*zcount);
+   ZVAL_LONG(*zcount, count);
}
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 / ChangeLog NEWS

2003-06-23 Thread Andrei Zmievski

andrei  Mon Jun 23 09:57:48 2003 EDT

  Modified files:  
/php4   ChangeLog NEWS 
  Log:
  By request
  
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.1356 php4/ChangeLog:1.1357
--- php4/ChangeLog:1.1356   Sun Jun 22 21:27:12 2003
+++ php4/ChangeLog  Mon Jun 23 09:57:48 2003
@@ -9847,7 +9847,7 @@
 
 * ext/standard/string.c:
 - Fixed an infinite loop in setlocale() when only invalid locale names
-  were passed in the array. (patch by Pal Loberg, [EMAIL PROTECTED]).
+  were passed in the array. (patch by Pal Loberg, pallo[at]initio.no).
 
 2002-10-18  Wez Furlong  <[EMAIL PROTECTED]>
 
Index: php4/NEWS
diff -u php4/NEWS:1.1427 php4/NEWS:1.1428
--- php4/NEWS:1.1427Sun Jun 22 21:27:13 2003
+++ php4/NEWS   Mon Jun 23 09:57:48 2003
@@ -424,7 +424,7 @@
 - Updated FDF extension to work with Adode fdftk 5.0. (Hartmut)
 - Added mb_strtolower() and mb_strtoupper(). (Moriyoshi)
 - Fixed an infinite loop in setlocale() when only invalid locale names
-  were passed in the array. (patch by Pal Loberg, [EMAIL PROTECTED])
+  were passed in the array. (patch by Pal Loberg, pallo[at]initio.no)
 - Fixed bugs #19156 and #19544 (COM extension leaks memory and keeps
   components referenced). (Harald)
 - Added fribidi_get_charsets() and fribidi_charset_info() functions. (Tal)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / ChangeLog NEWS

2003-06-23 Thread Andrei Zmievski

andrei  Mon Jun 23 09:56:24 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   ChangeLog NEWS 
  Log:
  By request
  
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.1211.2.1 php4/ChangeLog:1.1211.2.2
--- php4/ChangeLog:1.1211.2.1   Thu Dec 26 23:00:09 2002
+++ php4/ChangeLog  Mon Jun 23 09:56:19 2003
@@ -9847,7 +9847,7 @@
 
 * ext/standard/string.c:
 - Fixed an infinite loop in setlocale() when only invalid locale names
-  were passed in the array. (patch by Pal Loberg, [EMAIL PROTECTED]).
+  were passed in the array. (patch by Pal Loberg, pallo[at]initio.no).
 
 2002-10-18  Wez Furlong  <[EMAIL PROTECTED]>
 
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.263 php4/NEWS:1.1247.2.264
--- php4/NEWS:1.1247.2.263  Sun Jun 22 12:48:16 2003
+++ php4/NEWS   Mon Jun 23 09:56:21 2003
@@ -424,7 +424,7 @@
 - Updated FDF extension to work with Adode fdftk 5.0. (Hartmut)
 - Added mb_strtolower() and mb_strtoupper(). (Moriyoshi)
 - Fixed an infinite loop in setlocale() when only invalid locale names
-  were passed in the array. (patch by Pal Loberg, [EMAIL PROTECTED])
+  were passed in the array. (patch by Pal Loberg, pallo[at]initio.no)
 - Fixed bugs #19156 and #19544 (COM extension leaks memory and keeps
   components referenced). (Harald)
 - Added fribidi_get_charsets() and fribidi_charset_info() functions. (Tal)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5) / acinclude.m4

[PHP-CVS] cvs: php-src(PHP_5) / acinclude.m4 configure.in /ext/openssl config.m4 config0.m4 /ext/snmp config.m4 /scripts phpize.m4

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: php-src(PHP_5) / NEWS

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: spl / README

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: CVSROOT / modules

[PHP-CVS] cvs: spl / README.PROFILING

[PHP-CVS] cvs: php-src(PHP_4) /ext/standard/tests/file bug21131.phpt /pear pear.m4 /pear/packages Mail-1.0.1.tar Net_SMTP-1.0.tar XML_Parser-1.0.tar /pear/scripts php-config.in phpextdist phpize.in /scripts config-stubs conv_proto conv_z_macros credits /win32 php5ts.dsw

[PHP-CVS] cvs: php4 /ext/snmp snmp.c

[PHP-CVS] cvs: php4 /ext/snmp php_snmp.h snmp.c

[PHP-CVS] cvs: php5 / configure.in

[PHP-CVS] cvs: php5 /ext/standard/tests/strings bug24281.phpt

[PHP-CVS] cvs: php5 /ext/standard string.c

[PHP-CVS] cvs: php4 / ChangeLog NEWS

[PHP-CVS] cvs: php4(PHP_4_3) / ChangeLog NEWS

21 matches

Site Navigation

Mail list logo

Footer information