date:20050611

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2005-06-11 Thread changelog

changelog   Sun Jun 12 01:40:06 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2011r2=1.2012ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2011 php-src/ChangeLog:1.2012
--- php-src/ChangeLog:1.2011Sat Jun 11 01:40:03 2005
+++ php-src/ChangeLog   Sun Jun 12 01:40:01 2005
@@ -1,3 +1,41 @@
+2005-06-11  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  ext/standard/url_scanner_ex.c
+  ext/standard/var_unserializer.c:
+  Revert. re2c 0.9.7 obviously does not work properly (or our .re files are
+  buggy)
+
+* ext/standard/url_scanner_ex.c
+  ext/standard/var_unserializer.c:
+  revert
+
+* ext/mysql/config.m4:
+  Another netware fix
+
+* NEWS:
+  Merge the bug fix entries from PHP_5_0 branch
+
+* ext/standard/url_scanner_ex.c
+  ext/standard/url_scanner_ex.c
+  ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.c:
+  regenerated with re2c 0.9.7
+
+2005-06-11  Andi Gutmans  [EMAIL PROTECTED]
+
+* configure.in
+  ZendEngine2/zend.h
+  main/php_version.h:
+  - Back to -dev
+
+* (php_5_1_0b2)
+  NEWS
+  configure.in
+  ZendEngine2/zend.h
+  main/php_version.h:
+  - b2 (will post it to internals@)
+
 2005-06-10  Andi Gutmans  [EMAIL PROTECTED]
 
 * configure.in
@@ -4168,7 +4206,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2011 2005/06/11 05:40:03 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -7569,7 +7607,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2011 2005/06/11 05:40:03 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -8050,7 +8088,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2011 2005/06/11 05:40:03 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -9524,7 +9562,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2011 2005/06/11 05:40:03 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_driver.c

2005-06-11 Thread Wez Furlong

wez Sat Jun 11 08:38:12 2005 EDT

  Modified files:  
/php-src/ext/pdo_odbc   odbc_driver.c 
  Log:
  Fix for PECL #3714: beginTransaction doesn't work if you're in auto-commit 
mode.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.21r2=1.22ty=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.21 
php-src/ext/pdo_odbc/odbc_driver.c:1.22
--- php-src/ext/pdo_odbc/odbc_driver.c:1.21 Sun Feb  6 12:49:48 2005
+++ php-src/ext/pdo_odbc/odbc_driver.c  Sat Jun 11 08:38:12 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: odbc_driver.c,v 1.21 2005/02/06 17:49:48 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.22 2005/06/11 12:38:12 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -218,7 +218,17 @@
 
 static int odbc_handle_begin(pdo_dbh_t *dbh TSRMLS_DC)
 {
-   /* with ODBC, there is nothing special to be done */
+   if (dbh-auto_commit) {
+   /* we need to disable auto-commit now, to be able to initiate a 
transaction */
+   RETCODE rc;
+   pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh-driver_data;
+
+   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_OFF, SQL_NTS);
+   if (rc != SQL_SUCCESS) {
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
+   return 0;
+   }
+   }
return 1;
 }
 
@@ -236,6 +246,16 @@
return 0;
}
}
+
+   if (dbh-auto_commit) {
+   /* turn auto-commit back on again */
+   RETCODE rc;
+   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_ON, SQL_NTS);
+   if (rc != SQL_SUCCESS) {
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
+   return 0;
+   }
+   }
return 1;
 }
 
@@ -253,6 +273,16 @@
return 0;
}
}
+   if (dbh-auto_commit  H-dbc  dbh-in_txn) {
+   /* turn auto-commit back on again */
+   RETCODE rc;
+   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_ON, SQL_NTS);
+   if (rc != SQL_SUCCESS) {
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
+   return 0;
+   }
+   }
+
return 1;
 }
 
@@ -328,7 +358,7 @@
}
 
if (!dbh-auto_commit) {
-   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
SQL_AUTOCOMMIT_OFF, SQL_IS_UINTEGER);
+   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_OFF, SQL_NTS);
if (rc != SQL_SUCCESS) {
pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
odbc_handle_closer(dbh TSRMLS_CC);

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

[PHP-CVS] cvs: php-src /ext/pdo_odbc config.m4

2005-06-11 Thread Wez Furlong

wez Sat Jun 11 09:27:50 2005 EDT

  Modified files:  
/php-src/ext/pdo_odbc   config.m4 
  Log:
  become a better config.m4 citizen
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.16r2=1.17ty=u
Index: php-src/ext/pdo_odbc/config.m4
diff -u php-src/ext/pdo_odbc/config.m4:1.16 php-src/ext/pdo_odbc/config.m4:1.17
--- php-src/ext/pdo_odbc/config.m4:1.16 Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_odbc/config.m4  Sat Jun 11 09:27:50 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.16 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.17 2005/06/11 13:27:50 wez Exp $
 dnl config.m4 for extension pdo_odbc
 dnl vim:et:sw=2:ts=2:
 
@@ -30,10 +30,10 @@
 if test $PHP_PDO_ODBC != no; then
   AC_MSG_CHECKING([for selected PDO ODBC flavour])
 
-  pdo_odbc_flavour=`echo $withval | cut -d, -f1`
-  pdo_odbc_dir=`echo $withval | cut -d, -f2`
+  pdo_odbc_flavour=`echo $PHP_PDO_ODBC | cut -d, -f1`
+  pdo_odbc_dir=`echo $PHP_PDO_ODBC | cut -d, -f2`
 
-  if test $pdo_odbc_dir = $withval ; then
+  if test $pdo_odbc_dir = $PHP_PDO_ODBC ; then
 pdo_odbc_dir=
   fi
 
@@ -107,6 +107,7 @@
   PDO_ODBC_LFLAGS=-L$PDO_ODBC_LIBDIR
   PDO_ODBC_LIBS=$pdo_odbc_def_lib
 
+  save_old_LDFLAGS=$LDFLAGS
   LDFLAGS=$PDO_ODBC_LFLAGS $PDO_ODBC_LIBS -lm -ldl
   dnl Check for an ODBC 1.0 function to assert that the libraries work
   AC_TRY_LINK_FUNC([SQLBindCol],[],[

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

[PHP-CVS] cvs: CVSROOT / avail

2005-06-11 Thread Wez Furlong

wez Sat Jun 11 09:59:41 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  Dan would like to adjust the tests
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.985r2=1.986ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.985 CVSROOT/avail:1.986
--- CVSROOT/avail:1.985 Fri Jun 10 11:04:47 2005
+++ CVSROOT/avail   Sat Jun 11 09:59:39 2005
@@ -282,7 +282,7 @@
 # we can put in place a more general process.
 unavail||pecl/ibm_db2,pecl/pdo_odbc,ext/pdo_odbc
 avail|dbs,skoduru|pecl/ibm_db2
-avail|wez|pecl/pdo_odbc
+avail|wez,dbs|pecl/pdo_odbc
 
 
-# :vim: set ft=sh
+# vim:set ft=conf sw=2 ts=2 et:

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

[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_driver.c

2005-06-11 Thread Wez Furlong

wez Sat Jun 11 10:48:07 2005 EDT

  Modified files:  
/php-src/ext/pdo_odbc   odbc_driver.c 
  Log:
  hunting for a bug.  Looks like it might be yet-another-mysterious-shutdown 
problem.
  
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.22r2=1.23ty=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.22 
php-src/ext/pdo_odbc/odbc_driver.c:1.23
--- php-src/ext/pdo_odbc/odbc_driver.c:1.22 Sat Jun 11 08:38:12 2005
+++ php-src/ext/pdo_odbc/odbc_driver.c  Sat Jun 11 10:48:06 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: odbc_driver.c,v 1.22 2005/06/11 12:38:12 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.23 2005/06/11 14:48:06 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -101,8 +101,10 @@
SQLEndTran(SQL_HANDLE_DBC, H-dbc, SQL_ROLLBACK);
SQLDisconnect(H-dbc);
SQLFreeHandle(SQL_HANDLE_DBC, H-dbc);
+   H-dbc = NULL;
}
SQLFreeHandle(SQL_HANDLE_ENV, H-env);
+   H-env = NULL;
pefree(H, dbh-is_persistent);
 
return 0;
@@ -249,10 +251,9 @@
 
if (dbh-auto_commit) {
/* turn auto-commit back on again */
-   RETCODE rc;
rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_ON, SQL_NTS);
if (rc != SQL_SUCCESS) {
-   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = ON);
return 0;
}
}
@@ -263,7 +264,7 @@
 {
pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh-driver_data;
RETCODE rc;
-
+   
rc = SQLEndTran(SQL_HANDLE_DBC, H-dbc, SQL_ROLLBACK);
 
if (rc != SQL_SUCCESS) {
@@ -273,12 +274,11 @@
return 0;
}
}
-   if (dbh-auto_commit  H-dbc  dbh-in_txn) {
+   if (dbh-auto_commit  H-dbc) {
/* turn auto-commit back on again */
-   RETCODE rc;
rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_ON, SQL_NTS);
if (rc != SQL_SUCCESS) {
-   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = ON);
return 0;
}
}
@@ -357,13 +357,12 @@
return 0;
}
 
-   if (!dbh-auto_commit) {
-   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT, 
(SQLPOINTER)SQL_AUTOCOMMIT_OFF, SQL_NTS);
-   if (rc != SQL_SUCCESS) {
-   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT = 
OFF);
-   odbc_handle_closer(dbh TSRMLS_CC);
-   return 0;
-   }
+   rc = SQLSetConnectAttr(H-dbc, SQL_ATTR_AUTOCOMMIT,
+   (SQLPOINTER)(dbh-auto_commit ? SQL_AUTOCOMMIT_ON : 
SQL_AUTOCOMMIT_OFF), SQL_NTS);
+   if (rc != SQL_SUCCESS) {
+   pdo_odbc_drv_error(SQLSetConnectAttr AUTOCOMMIT);
+   odbc_handle_closer(dbh TSRMLS_CC);
+   return 0;
}
 
/* set up the cursor library, if needed, or if configured explicitly */

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

[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h

2005-06-11 Thread Andi Gutmans

andiSat Jun 11 13:03:43 2005 EDT

  Modified files:  
/php-srcconfigure.in 
/ZendEngine2zend.h 
/php-src/main   php_version.h 
  Log:
  - Back to -dev
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.562r2=1.563ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.562 php-src/configure.in:1.563
--- php-src/configure.in:1.562  Sat Jun 11 12:59:22 2005
+++ php-src/configure.inSat Jun 11 13:03:41 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.562 2005/06/11 16:59:22 andi Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.563 2005/06/11 17:03:41 andi Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=1
 RELEASE_VERSION=0
-EXTRA_VERSION=b2
+EXTRA_VERSION=-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.277r2=1.278ty=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.277 ZendEngine2/zend.h:1.278
--- ZendEngine2/zend.h:1.277Sat Jun 11 12:59:24 2005
+++ ZendEngine2/zend.h  Sat Jun 11 13:03:42 2005
@@ -17,12 +17,12 @@
+--+
 */
 
-/* $Id: zend.h,v 1.277 2005/06/11 16:59:24 andi Exp $ */
+/* $Id: zend.h,v 1.278 2005/06/11 17:03:42 andi Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION 2.1.0b2
+#define ZEND_VERSION 2.1.0-dev
 
 #define ZEND_ENGINE_2
 
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.101r2=1.102ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.101 php-src/main/php_version.h:1.102
--- php-src/main/php_version.h:1.101Sat Jun 11 12:59:24 2005
+++ php-src/main/php_version.h  Sat Jun 11 13:03:42 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION b2
-#define PHP_VERSION 5.1.0b2
+#define PHP_EXTRA_VERSION -dev
+#define PHP_VERSION 5.1.0-dev

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

Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h

2005-06-11 Thread Derick Rethans

On Sat, 11 Jun 2005, Andi Gutmans wrote:

 andi  Sat Jun 11 12:59:25 2005 EDT
 
   Modified files:  
 /php-src  NEWS configure.in 
 /ZendEngine2  zend.h 
 /php-src/main php_version.h 
   Log:
   - b2 (will post it to internals@)

Can you hold on for this for atleast 1-2 days?

Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

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

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 14:00:38 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c url_scanner_ex.c 
  Log:
  regenerated with re2c 0.9.7
  http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.66r2=1.67ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.66 
php-src/ext/standard/var_unserializer.c:1.67
--- php-src/ext/standard/var_unserializer.c:1.66Thu Jun  2 01:49:56 2005
+++ php-src/ext/standard/var_unserializer.c Sat Jun 11 14:00:36 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Thu Jun  2 08:48:59 2005 */
+/* Generated by re2c 0.9.7 on Sat Jun 11 20:57:50 2005 */
 #line 1 /usr/src/php/php5/ext/standard/var_unserializer.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.66 2005/06/02 05:49:56 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.67 2005/06/11 18:00:36 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -354,11 +354,6 @@
 


-
-#line 7 stdout
-{
-   YYCTYPE yych;
-   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -393,6 +388,11 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
+
+#line 393 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
goto yy0;
++YYCURSOR;
 yy0:
@@ -451,7 +451,7 @@
 yy4:
 #line 626 /usr/src/php/php5/ext/standard/var_unserializer.re
 { return 0; }
-#line 103 stdout
+#line 455 stdout
 yy5:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -496,7 +496,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of 
serialized data);
return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 148 stdout
+#line 500 stdout
 yy16:  yych = *++YYCURSOR;
goto yy4;
 yy17:  yych = *++YYCURSOR;
@@ -637,7 +637,7 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 290 stdout
+#line 641 stdout
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -674,7 +674,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 328 stdout
+#line 678 stdout
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -720,7 +720,7 @@
 
return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 375 stdout
+#line 724 stdout
 yy38:  yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy2;
@@ -772,7 +772,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
 }
-#line 428 stdout
+#line 776 stdout
 yy45:  yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -868,7 +868,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
 }
-#line 526 stdout
+#line 872 stdout
 yy57:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -943,7 +943,7 @@
 
return 1;
 }
-#line 603 stdout
+#line 947 stdout
 yy68:  yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy2;
@@ -979,7 +979,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
 }
-#line 640 stdout
+#line 983 stdout
 yy75:  yych = *++YYCURSOR;
if(yych = '/') goto yy2;
if(yych = '2') goto yy2;
@@ -997,7 +997,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
 }
-#line 658 stdout
+#line 1001 stdout
 yy79:  ++YYCURSOR;
goto yy80;
 yy80:
@@ -1008,7 +1008,7 @@
ZVAL_NULL(*rval);
return 1;
 }
-#line 669 stdout
+#line 1012 stdout
 yy81:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -1057,7 +1057,7 @@

return 1;
 }
-#line 719 stdout
+#line 1061 stdout
 yy87:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -1104,7 +1104,7 @@

return 1;
 }
-#line 767 stdout
+#line 1108 stdout
 }
 #line 628 /usr/src/php/php5/ext/standard/var_unserializer.re
 
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.91r2=1.92ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.91 
php-src/ext/standard/url_scanner_ex.c:1.92
--- php-src/ext/standard/url_scanner_ex.c:1.91  Thu Apr 14 18:38:29 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sat Jun 11 14:00:37 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Fri Apr 15 01:37:31 2005 */
+/* Generated by re2c 0.9.7 on Sat Jun 11 20:58:17 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*

Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h

2005-06-11 Thread Andi Gutmans

I can but I'd prefer to know what we're holding for. I am in no hurry to 
post it today, especially as it's the weekend and I have family to be with :)


At 07:39 PM 6/11/2005 +0200, Derick Rethans wrote:

On Sat, 11 Jun 2005, Andi Gutmans wrote:

 andi  Sat Jun 11 12:59:25 2005 EDT

   Modified files:
 /php-src  NEWS configure.in
 /ZendEngine2  zend.h
 /php-src/main php_version.h
   Log:
   - b2 (will post it to internals@)

Can you hold on for this for atleast 1-2 days?

Derick

--
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org


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

[PHP-CVS] cvs: php-src / NEWS

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 16:19:35 2005 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  Merge the bug fix entries from PHP_5_0 branch
  http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1912r2=1.1913ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1912 php-src/NEWS:1.1913
--- php-src/NEWS:1.1912 Sat Jun 11 12:59:21 2005
+++ php-src/NEWSSat Jun 11 16:19:34 2005
@@ -7,16 +7,10 @@
   auto-commit mode). (Wez)
 
 10 Jun 2005, PHP 5.1 Beta 1
-- Added user opcode API that allow overloading of opcode handlers. (Dmitry)
-- Opcodes ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR are mefget into one
-  ZEND_NEW. (Dmitry)
 - Upgraded PCRE library to version 5.0. (Andrei)
-- Added an optional remove old session parameter to session_regenerate_id(). 
(Ilia)
-- Added array type hinting. (Dmitry)
 - Removed php_check_syntax() function which never worked properly. (Ilia)
 - Removed garbage manager in Zend Engine which results in more aggressive
   freeing of data. (Dmitry, Andi)
-- String offsets were re-designed and re-implemented (Dmitry)
 - Moved extensions to PECL:
   . ext/cpdf(Tony, Derick)
   . ext/dio (Jani, Derick)
@@ -25,11 +19,13 @@
   . ext/mnogosearch (Jani, Derick)
   . ext/w32api  (Jani, Derick)
   . ext/yp  (Jani, Derick)
+- Changed sha1_file() and md5_file() functions to use streams instead of
+  low level IO. (Uwe)
+- Changed abstract private methods to be not allowed anymore. (Stas)
 - Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
 - Changed mysqli_exception and sqlite_exception to use RuntimeException as 
base 
   if SPL extension is present. (Georg, Marcus)
 - Improved interactive mode of PHP CLI (php -a). (Johannes, Marcus)
-- Improved support for embedded server in mysqli. (Georg)
 - Improved performance of:
   . general execution/compilation. (Andi, Thies, Sterling, Dmitry, Marcus)
   . switch() statement. (Dmitry)
@@ -37,7 +33,16 @@
   . virtual path handling by adding a realpath() cache. (Andi)
   . variable fetches. (Andi)
   . magic method invocations. (Marcus)
-- Improved extension SPL (Marcus).
+- Improved support for embedded server in mysqli. (Georg)
+- Improved mysqli extension. (Georg)
+  . added constructor for mysqli_stmt and mysqli_result classes
+  . added new function mysqli_get_charset()
+  . added new function mysqli_set_charset()
+  . added new class mysqli_driver
+  . added new class mysqli_warning
+  . added new class mysqli_execption 
+  . added new class mysqli_sql_exception
+- Improved SPL extension. (Marcus)
   . added standard hierarchy of Exception classes
   . added interface Countable
   . added interfaces Subject and Observer
@@ -46,6 +51,12 @@
   . added class FileObject
   . added possibility to use a string with class_parents() and
 class_implements(). (Andrey)
+- Added man pages for phpize and php-config scripts. (Jakub Vrana)
+- Added support for .cc files in extensions. (Brian)
+- Added PHP_INT_MAX and PHP_INT_SIZE as predefined constants. (Andrey)
+- Added user opcode API that allow overloading of opcode handlers. (Dmitry)
+- Added an optional remove old session parameter to session_regenerate_id(). 
(Ilia)
+- Added array type hinting. (Dmitry)
 - Added the tidy_get_opt_doc() function to return documentation for
   configuration options in tidy. (Patch by: [EMAIL PROTECTED])
 - Added support for .cc files in extensions. (Brian)
@@ -67,13 +78,6 @@
   . pg_result_error_field() - highly detailed error information, 
 most importantly the SQLSTATE error code.
   . pg_set_error_verbosity() - set verbosity of errors.
-- Improved extension mysqli (Georg)
-  . added constructor for mysqli_stmt and mysqli_result classes
-  . added new function mysqli_get_charset
-  . added new class mysqli_driver
-  . added new class mysqli_warning
-  . added new class mysqli_execption 
-  . added new class mysqli_sql_exception
 - Added optional fifth parameter count to preg_replace_callback() and
   preg_replace() to count the number of replacements made. FR #32275. (Andrey)
 - Added optional third parameter charlist to str_word_count() which
@@ -122,19 +126,110 @@
 - Added HTTP/1.1 and chunked encoding support to http:// wrapper. (Sara)
 - Added max_redirects context option that specifies how many HTTP 
   redirects to follow. (Ilia)
-- Added support of parameter=value arrays to
-  xsl_xsltprocessor_set_parameter(). (Tony)
+- Added support of parameter=value arrays to 
xsl_xsltprocessor_set_parameter().
+  (Tony)
 - Fixed extension initialization to respect dependancies between extensions.
   (Wez)
+- Fixed ext/mysqli to allocate less memory when fetching bound params
+  of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
+- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed memory corruption in stristr(). (Derick)
+- Fixed segfaults when CURL callback functions throw exception. (Tony)
 - Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus)
 - Fixed bug with

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 16:21:51 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   var_unserializer.c url_scanner_ex.c 
  Log:
  regenerated with re2c 0.9.7
  http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.24r2=1.18.4.24.2.1ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.24 
php-src/ext/standard/var_unserializer.c:1.18.4.24.2.1
--- php-src/ext/standard/var_unserializer.c:1.18.4.24   Thu Apr 14 18:41:39 2005
+++ php-src/ext/standard/var_unserializer.c Sat Jun 11 16:21:50 2005
@@ -1,24 +1,24 @@
-/* Generated by re2c 0.9.6 on Fri Apr 15 01:41:08 2005 */
-#line 1 /usr/src/php/php_4_3/ext/standard/var_unserializer.re
+/* Generated by re2c 0.9.7 on Sat Jun 11 22:56:18 2005 */
+#line 1 /usr/src/php/php5/ext/standard/var_unserializer.re
 /*
-   +--+
-   | PHP Version 4|
-   +--+
-   | Copyright (c) 1997-2003 The PHP Group|
-   +--+
-   | This source file is subject to version 2.02 of the PHP license,  |
-   | that is bundled with this package in the file LICENSE, and is|
-   | available at through the world-wide-web at   |
-   | http://www.php.net/license/2_02.txt. |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to  |
-   | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
-   +--+
-   | Authors: Sascha Schumann [EMAIL PROTECTED]|
-   +--+
+  +--+
+  | PHP Version 5|
+  +--+
+  | Copyright (c) 1997-2004 The PHP Group|
+  +--+
+  | This source file is subject to version 3.0 of the PHP license,   |
+  | that is bundled with this package in the file LICENSE, and is|
+  | available through the world-wide-web at the following url:   |
+  | http://www.php.net/license/3_0.txt.  |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to  |
+  | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
+  +--+
+  | Author: Sascha Schumann [EMAIL PROTECTED] |
+  +--+
 */
 
-/* $Id: var_unserializer.c,v 1.18.4.24 2005/04/14 22:41:39 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.24.2.1 2005/06/11 20:21:50 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -89,7 +89,7 @@
for (i = 0; i  var_hash-used_slots; i++) {
if (var_hash-data[i] == ozval) {
var_hash-data[i] = *nzval;
-   return;
+   /* do not break here */
}
}
var_hash = var_hash-next;
@@ -125,7 +125,7 @@
efree(var_hash);
var_hash = next;
}
-   
+
var_hash = var_hashx-first_dtor;

while (var_hash) {
@@ -147,7 +147,7 @@
 #define YYMARKER marker
 
 
-#line 154 /usr/src/php/php_4_3/ext/standard/var_unserializer.re
+#line 155 /usr/src/php/php5/ext/standard/var_unserializer.re
 
 
 
@@ -277,10 +277,37 @@
return 0;
 }
 
-static inline int object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
+static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 {
-   long elements;
+   long datalen;
+
+   if(ce-unserialize == NULL) {
+   zend_error(E_WARNING, Class %s has no unserializer, ce-name);
+   return 0;
+   }
+
+   datalen = parse_iv2((*p) + 2, p);
+
+   (*p) += 2;
+
+   if(datalen  0 || (*p) + datalen = max) {
+   zend_error(E_WARNING, Insufficient data for unserializing - 
%ld required, %d present, datalen, max - (*p));
+   return 0;
+   }
+
+   if(ce-unserialize(rval, ce, (const unsigned char*)*p, datalen, 
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
+   return 0;
+   }
+
+   (*p) +=

[PHP-CVS] cvs: php-src /ext/mysql config.m4

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 19:32:46 2005 EDT

  Modified files:  
/php-src/ext/mysql  config.m4 
  Log:
  Another netware fix
  
http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.65r2=1.66ty=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.65 php-src/ext/mysql/config.m4:1.66
--- php-src/ext/mysql/config.m4:1.65Tue Jun  7 08:39:01 2005
+++ php-src/ext/mysql/config.m4 Sat Jun 11 19:32:46 2005
@@ -1,9 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.65 2005/06/07 12:39:01 sniper Exp $
+dnl $Id: config.m4,v 1.66 2005/06/11 23:32:46 sniper Exp $
 dnl
 
 AC_DEFUN([MYSQL_LIB_CHK], [
-  str=$MYSQL_DIR/$1/libmysqlclient.*
+  str=$MYSQL_DIR/$1/lib$MY_LIBNAME.*
   for j in `echo $str`; do
 if test -r $j; then
   MYSQL_LIB_DIR=$MYSQL_DIR/$1
@@ -86,20 +86,27 @@
 Note that the MySQL client library is not bundled anymore!])
   fi
 
+  MY_LIBNAME=mysqlclient
+  case $host_alias in
+*netware*[)]
+  MY_LIBNAME=mysql
+  ;;
+  esac
+
   for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do
 MYSQL_LIB_CHK($i)
   done
 
   if test -z $MYSQL_LIB_DIR; then
-AC_MSG_ERROR([Cannot find libmysqlclient under $MYSQL_DIR.
+AC_MSG_ERROR([Cannot find lib$MY_LIBNAME under $MYSQL_DIR.
 Note that the MySQL client library is not bundled anymore!])
   fi
 
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ],
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_close, [ ],
   [
 if test $PHP_ZLIB_DIR != no; then
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQL_SHARED_LIBADD)
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [
 AC_MSG_ERROR([mysql configure failed. Please check config.log for more 
information.])
   ], [
 -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR 
@@ -107,7 +114,7 @@
   MYSQL_LIBS=-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz
 else
   PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
-  PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
+  PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [
 AC_MSG_ERROR([Try adding --with-zlib-dir=DIR. Please check 
config.log for more information.])
   ], [
 -L$MYSQL_LIB_DIR
@@ -124,7 +131,7 @@
   PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
 
   MYSQL_MODULE_TYPE=external
-  MYSQL_LIBS=-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS
+  MYSQL_LIBS=-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR
  
   PHP_SUBST(MYSQL_SHARED_LIBADD)

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

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 19:53:22 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  revert
  http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.92r2=1.93ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.92 
php-src/ext/standard/url_scanner_ex.c:1.93
--- php-src/ext/standard/url_scanner_ex.c:1.92  Sat Jun 11 14:00:37 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sat Jun 11 19:53:21 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.7 on Sat Jun 11 20:58:17 2005 */
+/* Generated by re2c 0.9.6 on Sun Jun 12 02:51:22 2005 */
 #line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.92 2005/06/11 18:00:37 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.93 2005/06/11 23:53:21 sniper Exp $ */
 
 #include php.h
 
@@ -109,6 +109,11 @@
q = (p = url-c) + url-len;
 
 scan:
+
+#line 7 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -143,10 +148,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 148 stdout
-{
-   YYCTYPE yych;
goto yy0;
++YYCURSOR;
 yy0:
@@ -163,19 +164,19 @@
 yy3:
 #line 115 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { smart_str_append(dest, url); return; }
-#line 167 stdout
+#line 61 stdout
 yy4:   ++YYCURSOR;
goto yy5;
 yy5:
 #line 116 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { sep = separator; goto scan; }
-#line 173 stdout
+#line 67 stdout
 yy6:   ++YYCURSOR;
goto yy7;
 yy7:
 #line 117 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { bash = p - 1; goto done; }
-#line 179 stdout
+#line 73 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -187,7 +188,7 @@
 yy10:
 #line 118 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { goto scan; }
-#line 191 stdout
+#line 86 stdout
 }
 #line 119 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
@@ -357,6 +358,11 @@

 state_plain:
start = YYCURSOR;
+
+#line 90 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -391,10 +397,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 396 stdout
-{
-   YYCTYPE yych;
goto yy11;
++YYCURSOR;
 yy11:
@@ -409,7 +411,7 @@
 yy14:
 #line 287 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 413 stdout
+#line 142 stdout
 yy15:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -421,13 +423,18 @@
 yy17:
 #line 288 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain; }
-#line 425 stdout
+#line 155 stdout
 }
 #line 289 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 
 
 state_tag: 
start = YYCURSOR;
+
+#line 159 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -462,10 +469,6 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
-
-#line 467 stdout
-{
-   YYCTYPE yych;
goto yy18;
++YYCURSOR;
 yy18:
@@ -482,13 +485,13 @@
 yy21:
 #line 294 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == 
STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 486 stdout
+#line 212 stdout
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
 #line 295 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 492 stdout
+#line 218 stdout
 yy24:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -506,6 +509,11 @@

 state_next_arg:
start = YYCURSOR;
+
+#line 231 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
  0,   0,   0,   0,   0,   0,   0,   0, 
  0, 128, 128, 128,   0,   0,   0,   0, 
@@ -540,10 +548,6 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
  0,   0,   0,   0,   0,   0,   0,   0, 
};
-
-#line 545 stdout
-{
-   YYCTYPE yych;
goto yy26;
++YYCURSOR;
 yy26:
@@ -573,26 +577,26 @@
 yy29:
 #line 304 /usr/src/php/php5/ext/standard/url_scanner_ex.re
 {

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard url_scanner_ex.c var_unserializer.c

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 19:55:40 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   url_scanner_ex.c var_unserializer.c 
  Log:
  Revert. re2c 0.9.7 obviously does not work properly (or our .re files are 
buggy)
  
  http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.72.2.15.2.1r2=1.72.2.15.2.2ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.72.2.15.2.1 
php-src/ext/standard/url_scanner_ex.c:1.72.2.15.2.2
--- php-src/ext/standard/url_scanner_ex.c:1.72.2.15.2.1 Sat Jun 11 16:21:50 2005
+++ php-src/ext/standard/url_scanner_ex.c   Sat Jun 11 19:55:39 2005
@@ -1,15 +1,15 @@
-/* Generated by re2c 0.9.7 on Sat Jun 11 22:56:09 2005 */
-#line 1 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.9.6 on Sun Jun 12 02:54:26 2005 */
+#line 1 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 /*
   +--+
-  | PHP Version 5|
+  | PHP Version 4|
   +--+
-  | Copyright (c) 1997-2004 The PHP Group|
+  | Copyright (c) 1997-2003 The PHP Group|
   +--+
-  | This source file is subject to version 3.0 of the PHP license,   |
+  | This source file is subject to version 2.02 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
-  | available through the world-wide-web at the following url:   |
-  | http://www.php.net/license/3_0.txt.  |
+  | available at through the world-wide-web at   |
+  | http://www.php.net/license/2_02.txt. |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to  |
   | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.72.2.15.2.1 2005/06/11 20:21:50 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.72.2.15.2.2 2005/06/11 23:55:39 sniper Exp $ */
 
 #include php.h
 
@@ -91,7 +91,7 @@
STD_PHP_INI_ENTRY(url_rewriter.tags, 
a=href,area=href,frame=src,form=,fieldset=, PHP_INI_ALL, OnUpdateTags, 
url_adapt_state_ex, php_basic_globals, basic_globals)
 PHP_INI_END()
 
-#line 97 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 97 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 
 
 #define YYFILL(n) goto done
@@ -109,6 +109,11 @@
q = (p = url-c) + url-len;
 
 scan:
+
+#line 7 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -143,10 +148,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 148 stdout
-{
-   YYCTYPE yych;
goto yy0;
++YYCURSOR;
 yy0:
@@ -161,21 +162,21 @@
 yy2:   ++YYCURSOR;
goto yy3;
 yy3:
-#line 115 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 115 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 { smart_str_append(dest, url); return; }
-#line 167 stdout
+#line 61 stdout
 yy4:   ++YYCURSOR;
goto yy5;
 yy5:
-#line 116 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 116 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 { sep = separator; goto scan; }
-#line 173 stdout
+#line 67 stdout
 yy6:   ++YYCURSOR;
goto yy7;
 yy7:
-#line 117 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 117 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 { bash = p - 1; goto done; }
-#line 179 stdout
+#line 73 stdout
 yy8:   ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -185,11 +186,11 @@
}
goto yy10;
 yy10:
-#line 118 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 118 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 { goto scan; }
-#line 191 stdout
+#line 86 stdout
 }
-#line 119 /usr/src/php/php5/ext/standard/url_scanner_ex.re
+#line 119 /usr/src/php/php_4_4/ext/standard/url_scanner_ex.re
 
 done:

@@ -357,6 +358,11 @@

 state_plain:
start = YYCURSOR;
+
+#line 90 stdout
+{
+   YYCTYPE yych;
+   unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
@@ -391,10 +397,6 @@
128, 128, 128, 128, 128, 128, 128, 128, 
128, 128, 128, 128, 128, 128, 128, 128, 
};
-
-#line 396 stdout
-{
-

[PHP-CVS] cvs: php-src /ext/standard dir.c

2005-06-11 Thread Hartmut Holzgraefe

hholzgraSat Jun 11 20:59:08 2005 EDT

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  Removed bogus fix for bug #28355 (it was dead code anyway)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.143r2=1.144ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.143 php-src/ext/standard/dir.c:1.144
--- php-src/ext/standard/dir.c:1.143Wed Feb 23 13:53:09 2005
+++ php-src/ext/standard/dir.c  Sat Jun 11 20:59:04 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.143 2005/02/23 18:53:09 iliaa Exp $ */
+/* $Id: dir.c,v 1.144 2005/06/12 00:59:04 hholzgra Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -399,9 +399,6 @@
 * doesn't. This ensure that if no match is found, an 
empty array
 * is always returned so it can be used without 
worrying in e.g.
 * foreach() */
-#ifndef __linux__
-   RETURN_FALSE;
-#else
array_init(return_value);
return;
 #endif

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

[PHP-CVS] cvs: php-src /ext/standard dir.c

2005-06-11 Thread Hartmut Holzgraefe

hholzgraSat Jun 11 21:13:25 2005 EDT

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  thinko fix (E_COMMIT_AFTER_MIDNIGHT)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.144r2=1.145ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.144 php-src/ext/standard/dir.c:1.145
--- php-src/ext/standard/dir.c:1.144Sat Jun 11 20:59:04 2005
+++ php-src/ext/standard/dir.c  Sat Jun 11 21:13:24 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.144 2005/06/12 00:59:04 hholzgra Exp $ */
+/* $Id: dir.c,v 1.145 2005/06/12 01:13:24 hholzgra Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -401,7 +401,6 @@
 * foreach() */
array_init(return_value);
return;
-#endif
}
 #endif
RETURN_FALSE;

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

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dir.c

2005-06-11 Thread Jani Taskinen

sniper  Sat Jun 11 21:15:44 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   dir.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.109.2.18r2=1.109.2.18.2.1ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.18 
php-src/ext/standard/dir.c:1.109.2.18.2.1
--- php-src/ext/standard/dir.c:1.109.2.18   Mon Jun  7 14:31:15 2004
+++ php-src/ext/standard/dir.c  Sat Jun 11 21:15:43 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.109.2.18 2004/06/07 18:31:15 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.18.2.1 2005/06/12 01:15:43 sniper Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -390,12 +390,8 @@
 * doesn't. This ensure that if no match is found, an 
empty array
 * is always returned so it can be used without 
worrying in e.g.
 * foreach() */
-#ifndef __linux__
-   RETURN_FALSE;
-#else
array_init(return_value);
return;
-#endif
}
 #endif
RETURN_FALSE;

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_driver.c

[PHP-CVS] cvs: php-src /ext/pdo_odbc config.m4

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_driver.c

[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h

Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h

[PHP-CVS] cvs: php-src / NEWS

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard url_scanner_ex.c var_unserializer.c

[PHP-CVS] cvs: php-src /ext/mysql config.m4

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c var_unserializer.c

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard url_scanner_ex.c var_unserializer.c

[PHP-CVS] cvs: php-src /ext/standard dir.c

[PHP-CVS] cvs: php-src /ext/standard dir.c

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dir.c

17 matches

Site Navigation

Mail list logo

Footer information