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

[changelog]

changelog   Thu Feb 24 20:35:41 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1904r2=1.1905ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1904 php-src/ChangeLog:1.1905
--- php-src/ChangeLog:1.1904Wed Feb 23 20:34:57 2005
+++ php-src/ChangeLog   Thu Feb 24 20:35:40 2005
@@ -1,3 +1,99 @@
+2005-02-24  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  NEWS
+  ext/mysqli/mysqli_nonapi.c:
+  MFH: Fixed bug #32081 (default socket value is not being used).
+
+* ext/mysqli/mysqli_nonapi.c:
+  Fixed bug #32081 (default socket value is not being used).
+
+2005-02-24  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/standard/image.c:
+  - Little speed up
+
+* ext/standard/image.c:
+  - This must be == 1
+
+2005-02-24  Jani Taskinen  [EMAIL PROTECTED]
+
+* acinclude.m4
+  configure.in
+  ext/iconv/config.m4:
+  - Fixed all buildconf warnings + cross-compiling issues
+
+2005-02-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_language_scanner.l:
+  - Make one line comments work the same with script ... /script as 
with
+  - other tags. This will break scripts that have whitespace at the end
+  - of the closing tag /script but this is barely used as it is
+  - and I doubt ppl used whitespace. (patch by Jani)
+
+2005-02-24  Jani Taskinen  [EMAIL PROTECTED]
+
+* TSRM/threads.m4:
+  - cross-compile fix
+
+2005-02-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_objects_API.h:
+  - This part of the patch was right
+
+2005-02-24  Jani Taskinen  [EMAIL PROTECTED]
+
+* acinclude.m4
+  configure.in
+  scripts/phpize.m4:
+  - Restructured and added a few comments here and there.
+  - Made macros of couple of tests previously littering configure.in
+(e.g. PHP_PROG_AWK, PHP_PROG_LEX, PHP_PROG_BISON..)
+  - Moved all PHP_SUBST() calls into their respective macros.
+(no point adding empty entries in Makefile if macro is not used)
+
+* ext/standard/var_unserializer.c:
+  - Generated with re2c 0.9.4
+
+2005-02-24  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.re:
+  fix typo
+
+2005-02-24  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  ZendEngine2/zend_execute.c
+  ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_execute.h
+  ZendEngine2/zend_vm_opcodes.h:
+  Fixed bug in ZEND_POST_INC/ZEND_POST_DEC handlers.
+  These opcodes assume IS_TMP_VAR as result.
+
+2005-02-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_modules.h:
+  - Need zend_Compile.h for struct _zend_arg_info  definiton (thanks to Joe
+  Orton)
+
+* main/streams/mmap.c:
+  - Fix comment
+
+* ZendEngine2/zend_objects.c
+  ZendEngine2/zend_objects.h
+  ZendEngine2/zend_objects_API.h:
+  - Revert following patch until we decide what is the right way to handle
+  - this:
+   - Fix signatures they are all meant to be able to deal with any type in
+  any
+  object storage (though we are still missing several parts)
+
+2005-02-24  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/standard/image.c:
+  - Prevent superflous memory allocation
+
 2005-02-23  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * ext/standard/image.c:
@@ -680,7 +776,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -1161,7 +1257,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -2635,7 +2731,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.1904 2005/02/24 01:34:57 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[changelog]

changelog   Thu Feb 24 20:35:48 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.645r2=1.646ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.645 ZendEngine2/ChangeLog:1.646
--- ZendEngine2/ChangeLog:1.645 Wed Feb 23 20:35:08 2005
+++ ZendEngine2/ChangeLog   Thu Feb 24 20:35:47 2005
@@ -1,3 +1,39 @@
+2005-02-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* zend_language_scanner.l:
+  - Make one line comments work the same with script ... /script as 
with
+  - other tags. This will break scripts that have whitespace at the end
+  - of the closing tag /script but this is barely used as it is
+  - and I doubt ppl used whitespace. (patch by Jani)
+
+* zend_objects_API.h:
+  - This part of the patch was right
+
+2005-02-24  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  zend_execute.c
+  zend_vm_def.h
+  zend_vm_execute.h
+  zend_vm_opcodes.h:
+  Fixed bug in ZEND_POST_INC/ZEND_POST_DEC handlers.
+  These opcodes assume IS_TMP_VAR as result.
+
+2005-02-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* zend_modules.h:
+  - Need zend_Compile.h for struct _zend_arg_info  definiton (thanks to Joe
+  Orton)
+
+* zend_objects.c
+  zend_objects.h
+  zend_objects_API.h:
+  - Revert following patch until we decide what is the right way to handle
+  - this:
+   - Fix signatures they are all meant to be able to deal with any type in
+  any
+  object storage (though we are still missing several parts)
+
 2005-02-23  Derick Rethans  [EMAIL PROTECTED]
 
 * (PHP_5_0)
@@ -7164,7 +7200,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.645 2005/02/24 01:35:08 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.646 2005/02/25 01:35:47 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -,7 +8924,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.645 2005/02/24 01:35:08 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.646 2005/02/25 01:35:47 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]
 

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

[changelog]

changelog   Fri Feb 25 20:34:36 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1905r2=1.1906ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1905 php-src/ChangeLog:1.1906
--- php-src/ChangeLog:1.1905Thu Feb 24 20:35:40 2005
+++ php-src/ChangeLog   Fri Feb 25 20:34:35 2005
@@ -1,3 +1,61 @@
+2005-02-25  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/dba/config.m4
+  ext/dba/dba.c
+  ext/dba/dba_db1.c
+  ext/dba/php_db1.h
+  ext/dba/tests/dba_db1.phpt:
+  - Add support for db1 through emulation
+
+2005-02-25  Frank M. Kromann  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  ext/mssql/php_mssql.c:
+  MFH: FreeTDS does not have support for DBTEXTLIMIT
+
+* ext/mssql/php_mssql.c
+  ext/mssql/php_mssql.c:
+  FreeTDS does not have support for DBTEXTLIMIT
+
+2005-02-25  Rob Richards  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS
+  ext/domxml/php_domxml.c:
+  no message
+
+2005-02-25  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/dba/config.m4:
+  - Align
+
+2005-02-25  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/oci8/config.m4:
+  fix bug preventing from building oci8 as shared module
+  (patch by stanislav dot voroniy at portavita dot nl)
+
+2005-02-25  Georg Richter  [EMAIL PROTECTED]
+
+* ext/mysqli/tests/bug30967.phpt
+  ext/mysqli/tests/bug30967.phpt:
+  fix for bug #31939
+
+2005-02-25  Anantha Kesari H Y  [EMAIL PROTECTED]
+
+* netware/sendmail_nw.h:
+  changing the windows style path seperator in netinet\in.h to netinet/in.h
+
+* win32/sendmail.c:
+  time.h is available in NetWare LibC.
+  path sperator has been changed from \ to / while including
+  netware\sendmail_nw.h
+
+2005-02-25  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/exif/config.w32:
+  - Change to enable (synch with unix build system)
+
 2005-02-24  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_0)
@@ -776,7 +834,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.1906 2005/02/26 01:34:35 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -1257,7 +1315,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.1906 2005/02/26 01:34:35 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -2731,7 +2789,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.1905 2005/02/25 01:35:40 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.1906 2005/02/26 01:34:35 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

[PHP-CVS] cvs: php-src /win32/build Makefile

[Edin Kadribasic]

edink   Thu Feb 24 18:28:49 2005 EDT

  Modified files:  
/php-src/win32/buildMakefile 
  Log:
  Offical zip files have -Win32 suffix
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.29r2=1.30ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.29 php-src/win32/build/Makefile:1.30
--- php-src/win32/build/Makefile:1.29   Sun Feb  6 18:23:05 2005
+++ php-src/win32/build/MakefileThu Feb 24 18:28:49 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.29 2005/02/06 23:23:05 wez Exp $
+# $Id: Makefile,v 1.30 2005/02/24 23:28:49 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -84,7 +84,7 @@
 clean: clean-sapi
@echo Cleaning build dirs
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.*  
NUL
-   [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib 
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip  NUL
+   [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib 
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip  NUL
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) 
 
 clean-pecl:
@@ -106,13 +106,14 @@
 build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
+   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
+   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING).zip .
+   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
 
 dist: all build-dist

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

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

[Marcus Boerger]

helly   Thu Feb 24 15:22:40 2005 EDT

  Modified files:  
/php-src/ext/standard   image.c 
  Log:
  - Little speed up
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.106r2=1.107ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.106 php-src/ext/standard/image.c:1.107
--- php-src/ext/standard/image.c:1.106  Thu Feb 24 15:22:18 2005
+++ php-src/ext/standard/image.cThu Feb 24 15:22:40 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.106 2005/02/24 20:22:18 helly Exp $ */
+/* $Id: image.c,v 1.107 2005/02/24 20:22:40 helly Exp $ */
 
 #include php.h
 #include stdio.h
@@ -628,12 +628,19 @@
result-height = php_read4(stream TSRMLS_CC); /* Xsiz */
result-width = php_read4(stream TSRMLS_CC); /* Ysiz */
 
+#if MBO_0
dummy_int = php_read4(stream TSRMLS_CC); /* XOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* XTsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YTsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* XTOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YTOsiz */
+#else
+   if (php_stream_seek(stream, 24, SEEK_CUR)) {
+   efree(result);
+   return NULL;
+   }
+#endif
 
result-channels = php_read2(stream TSRMLS_CC); /* Csiz */
if (result-channels  0 || result-channels  256) {

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

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

[Marcus Boerger]

helly   Thu Feb 24 15:54:12 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   image.c 
  Log:
  - MFH
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.3r2=1.98.2.4ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.3 
php-src/ext/standard/image.c:1.98.2.4
--- php-src/ext/standard/image.c:1.98.2.3   Mon Oct  4 16:43:21 2004
+++ php-src/ext/standard/image.cThu Feb 24 15:54:12 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.98.2.3 2004/10/04 20:43:21 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.4 2005/02/24 20:54:12 helly Exp $ */
 
 #include php.h
 #include stdio.h
@@ -631,14 +631,25 @@
result-height = php_read4(stream TSRMLS_CC); /* Xsiz */
result-width = php_read4(stream TSRMLS_CC); /* Ysiz */
 
+#if MBO_0
dummy_int = php_read4(stream TSRMLS_CC); /* XOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* XTsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YTsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* XTOsiz */
dummy_int = php_read4(stream TSRMLS_CC); /* YTOsiz */
+#else
+   if (php_stream_seek(stream, 24, SEEK_CUR)) {
+   efree(result);
+   return NULL;
+   }
+#endif
 
result-channels = php_read2(stream TSRMLS_CC); /* Csiz */
+   if (result-channels  0 || result-channels  256) {
+   efree(result);
+   return NULL;
+   }
 
/* Collect bit depth info */
highest_bit_depth = bit_depth = 0;
@@ -701,7 +712,9 @@
}
 
/* Skip over LBox (Which includes both TBox and LBox itself */
-   php_stream_seek(stream, box_length - 8, SEEK_CUR); 
+   if (php_stream_seek(stream, box_length - 8, SEEK_CUR)) {
+   break;
+   }
}
 
if (result == NULL) {
@@ -864,43 +877,49 @@
  */
 static struct gfxinfo *php_handle_iff(php_stream * stream TSRMLS_DC)
 {
-   struct gfxinfo *result = NULL;
+   struct gfxinfo * result;
unsigned char a[10];
int chunkId;
int size;
+   short width, height, bits;
 
-   if (php_stream_read(stream, a, 8) != 8)
+   if (php_stream_read(stream, a, 8) != 8) {
return NULL;
-   if (strncmp(a+4, ILBM, 4)  strncmp(a+4, PBM , 4))
+   }
+   if (strncmp(a+4, ILBM, 4)  strncmp(a+4, PBM , 4)) {
return NULL;
-
-   result = (struct gfxinfo *) ecalloc(1, sizeof(struct gfxinfo));
+   }
 
/* loop chunks to find BMHD chunk */
do {
if (php_stream_read(stream, a, 8) != 8) {
-   efree(result);
return NULL;
}
chunkId = php_ifd_get32s(a+0, 1);
size= php_ifd_get32s(a+4, 1);
+   if (size  0) {
+   return NULL;
+   }
if ((size  1) == 1) {
size++;
}
if (chunkId == 0x424d4844) { /* BMHD chunk */
-   if (php_stream_read(stream, a, 9) != 9) {
-   efree(result);
+   if (size  9 || php_stream_read(stream, a, 9) != 9) {
return NULL;
}
-   result-width= php_ifd_get16s(a+0, 1);
-   result-height   = php_ifd_get16s(a+2, 1);
-   result-bits = a[8]  0xff;
-   result-channels = 0;
-   if (result-width  0  result-height  0  
result-bits  0  result-bits  33)
+   width  = php_ifd_get16s(a+0, 1);
+   height = php_ifd_get16s(a+2, 1);
+   bits   = a[8]  0xff;
+   if (width  0  height  0  bits  0  bits  33) {
+   result = (struct gfxinfo *) ecalloc(1, 
sizeof(struct gfxinfo));
+   result-width= width;
+   result-height   = height;
+   result-bits = bits;
+   result-channels = 0;
return result;
+   }
} else {
if (php_stream_seek(stream, size, SEEK_CUR)) {
-   efree(result);
return NULL;
}
}

-- 
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) /ext/standard image.c

[Marcus Boerger]

helly   Thu Feb 24 15:54:18 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   image.c 
  Log:
  - MFH
  http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.15r2=1.72.2.16ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.15 
php-src/ext/standard/image.c:1.72.2.16
--- php-src/ext/standard/image.c:1.72.2.15  Mon Oct  4 16:44:07 2004
+++ php-src/ext/standard/image.cThu Feb 24 15:54:18 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.72.2.15 2004/10/04 20:44:07 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.16 2005/02/24 20:54:18 helly Exp $ */
 
 #include php.h
 #include stdio.h
@@ -363,7 +363,7 @@
/* just return 0 if we hit the end-of-file */
if((php_stream_read(stream, a, sizeof(a))) = 0) return 0;
 
-   return (((unsigned short) a[ 0 ])  8) + ((unsigned short) a[ 1 ]);
+   return (((unsigned short)a[0])  8) + ((unsigned short)a[1]);
 }
 /* }}} */
 
@@ -374,7 +374,7 @@
int a=0, marker;
 
/* get marker byte, swallowing possible padding 
  */
-   if ( last_marker==M_COM  comment_correction) {
+   if (last_marker==M_COM  comment_correction) {
/* some software does not count the length bytes of COM section 
  */
/* one company doing so is very much envolved in JPEG... so we 
accept too */
/* by the way: some of those companies changed their code 
now...  */
@@ -383,7 +383,7 @@
last_marker = 0;
comment_correction = 0;
}
-   if ( ff_read) {
+   if (ff_read) {
a = 1; /* already read 0xff in filetype detection */
}
do {
@@ -391,9 +391,9 @@
{
return M_EOI;/* we hit EOF */
}
-   if ( last_marker==M_COM  comment_correction0)
+   if (last_marker==M_COM  comment_correction0)
{
-   if ( marker != 0xFF)
+   if (marker != 0xFF)
{
marker = 0xff;
comment_correction--;
@@ -401,14 +401,14 @@
last_marker = M_PSEUDO; /* stop skipping non 
0xff for M_COM */
}
}
-   if ( ++a  10)
+   if (++a  10)
{
/* who knows the maxim amount of 0xff? though 7 */
/* but found other implementations  */
return M_EOI;
}
-   } while ( marker == 0xff);
-   if ( a  2)
+   } while (marker == 0xff);
+   if (a  2)
{
return M_EOI; /* at least one 0xff is needed before marker code 
*/
}
@@ -422,35 +422,39 @@
 
 /* {{{ php_skip_variable
  * skip over a variable-length block; assumes proper length marker */
-static void php_skip_variable(php_stream * stream TSRMLS_DC)
+static int php_skip_variable(php_stream * stream TSRMLS_DC)
 {
off_t length = ((unsigned int)php_read2(stream TSRMLS_CC));
 
-   length = length-2;
-   if (length)
-   {
-   php_stream_seek(stream, (long)length, SEEK_CUR);
+   if (length  2) {
+   return 0;
}
+   length = length - 2;
+   php_stream_seek(stream, (long)length, SEEK_CUR);
+   return 1;
 }
 /* }}} */
 
 /* {{{ php_read_APP
  */
-static void php_read_APP(php_stream * stream, unsigned int marker, zval *info 
TSRMLS_DC)
+static int php_read_APP(php_stream * stream, unsigned int marker, zval *info 
TSRMLS_DC)
 {
unsigned short length;
unsigned char *buffer;
-   unsigned char markername[ 16 ];
+   unsigned char markername[16];
zval *tmp;
 
length = php_read2(stream TSRMLS_CC);
+   if (length  2) {
+   return 0;
+   }
length -= 2;/* length includes itself */
 
buffer = emalloc(length);
 
if (php_stream_read(stream, buffer, (long) length) = 0) {
efree(buffer);
-   return;
+   return 0;
}
 
sprintf(markername, APP%d, marker - M_APP0);
@@ -461,6 +465,7 @@
}
 
efree(buffer);
+   return 1;
 }
 /* }}} */
 
@@ -497,12 +502,16 @@
result-height   = php_read2(stream 
TSRMLS_CC);
result-width= php_read2(stream 
TSRMLS_CC);
result-channels = 
php_stream_getc(stream);
-   if (!info || length8) /* if we don't 
want an extanded info - return */
+   if (!info || length  8) { /* if we 
don't want an extanded info - return */
   

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_nonapi.c

[Ilia Alshanetsky]

iliaa   Thu Feb 24 18:59:00 2005 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_nonapi.c 
  Log:
  Fixed bug #32081 (default socket value is not being used).
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.39 
php-src/ext/mysqli/mysqli_nonapi.c:1.40
--- php-src/ext/mysqli/mysqli_nonapi.c:1.39 Fri Jan  7 09:59:59 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c  Thu Feb 24 18:58:59 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_nonapi.c,v 1.39 2005/01/07 14:59:59 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.40 2005/02/24 23:58:59 iliaa Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -83,6 +83,10 @@
}
 #endif
 
+   if (!socket) {
+   socket = MyG(default_socket);
+   }
+
if 
(mysql_real_connect(mysql-mysql,hostname,username,passwd,dbname,port,socket,CLIENT_MULTI_RESULTS)
 == NULL) {
/* Save error messages */
 

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

[PHP-CVS] cvs: php-src /win32/build Makefile config.w32

[Edin Kadribasic]

edink   Thu Feb 24 19:20:20 2005 EDT

  Modified files:  
/php-src/win32/buildMakefile config.w32 
  Log:
  Added --enable-debug-pack which will create a zip file with *.pdb debug
  symbol files. Could be used to allow windows users to use free Microsoft
  debugging tools to generate useful backtraces.
  
  Debug tools can be found at:
  http://www.microsoft.com/whdc/devtools/debugging/installx86.mspx
  
  CLAGS used described in:
  http://support.microsoft.com/default.aspx?scid=kb;en-us;291585
  
  Only tested on VC 6.0.
  
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.30r2=1.31ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.30 php-src/win32/build/Makefile:1.31
--- php-src/win32/build/Makefile:1.30   Thu Feb 24 18:28:49 2005
+++ php-src/win32/build/MakefileThu Feb 24 19:20:19 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.30 2005/02/24 23:28:49 edink Exp $
+# $Id: Makefile,v 1.31 2005/02/25 00:20:19 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -107,6 +107,7 @@
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -115,6 +116,9 @@
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
+   cd $(BUILD_DIR)
+   -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+   cd ..\..
 
 dist: all build-dist
 snap: build-snap build-dist
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.36r2=1.37ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.36 php-src/win32/build/config.w32:1.37
--- php-src/win32/build/config.w32:1.36 Tue Feb 15 08:57:49 2005
+++ php-src/win32/build/config.w32  Thu Feb 24 19:20:19 2005
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.36 2005/02/15 13:57:49 edink Exp $
+// $Id: config.w32,v 1.37 2005/02/25 00:20:19 edink Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -19,8 +19,11 @@
 PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
 
 ARG_ENABLE('debug', 'Compile with debugging symbols', no);
+ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols 
(--enable-debug must not be specified)', 'no');
+if (PHP_DEBUG == yes  PHP_DEBUG_PACK == yes) {
+   ERROR(Use of both --enable-debug and --enable-debug-pack not 
allowed.);
+}
 ARG_ENABLE('zts', 'Thread safety', 'yes');
-
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
@@ -64,6 +67,11 @@
// version of the libc
ADD_FLAG(PHP_LDFLAGS, /nodefaultlib:msvcrt);
 } else {
+   // Generate external debug files when --enable-debug-pack is specified
+   if (PHP_DEBUG_PACK == yes) {
+   ADD_FLAG(CFLAGS, /Zi);
+   ADD_FLAG(LDFLAGS, /incremental:no /debug /opt:ref,icf);
+   }
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /Ox /D NDebug /D NDEBUG \
 /D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);

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

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

[Jani Taskinen]

sniper  Thu Feb 24 12:50:21 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c 
  Log:
  - Generated with re2c 0.9.4
  
  http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.56r2=1.57ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.56 
php-src/ext/standard/var_unserializer.c:1.57
--- php-src/ext/standard/var_unserializer.c:1.56Thu Feb 24 05:58:16 2005
+++ php-src/ext/standard/var_unserializer.c Thu Feb 24 12:50:20 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Tue Feb 22 15:14:56 2005 */
-#line 1 /php5/ext/standard/var_unserializer.re
+/* Generated by re2c 0.9.4 on Thu Feb 24 19:48:52 2005 */
+#line 1 /usr/src/php/php5/ext/standard/var_unserializer.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.56 2005/02/24 10:58:16 stas Exp $ */
+/* $Id: var_unserializer.c,v 1.57 2005/02/24 17:50:20 sniper Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -147,7 +147,7 @@
 #define YYMARKER marker
 
 
-#line 155
+#line 155 /usr/src/php/php5/ext/standard/var_unserializer.re
 
 
 
@@ -353,6 +353,8 @@
 


+
+#line 7 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -432,7 +434,8 @@
goto yy16;
} else {
if(yych = '}') goto yy14;
-   if(yych = '\277')  goto yy16;
+   if(yych = 0xBF)goto yy16;
+   goto yy2;
}
}
}
@@ -443,9 +446,11 @@
 yy3:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy87;
+   goto yy4;
 yy4:
-#line 620
-   { return 0; }
+#line 621 /usr/src/php/php5/ext/standard/var_unserializer.re
+{ return 0; }
+#line 103 stdout
 yy5:   yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -481,41 +486,49 @@
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy17;
goto yy4;
-yy14:  yych = *++YYCURSOR;
+yy14:  ++YYCURSOR;
+   goto yy15;
 yy15:
-#line 614
-   {
+#line 615 /usr/src/php/php5/ext/standard/var_unserializer.re
+{
/* this is the case where we have less data than planned */
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
 yy16:  yych = *++YYCURSOR;
goto yy4;
 yy17:  yych = *++YYCURSOR;
if(yybm[0+yych]  128)  goto yy19;
if(yych != '+') goto yy2;
+   goto yy18;
 yy18:  yych = *++YYCURSOR;
if(yybm[0+yych]  128)  goto yy19;
goto yy2;
 yy19:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
+   goto yy20;
 yy20:  if(yybm[0+yych]  128)  goto yy19;
if(yych != ':') goto yy2;
+   goto yy21;
 yy21:  yych = *++YYCURSOR;
if(yych != '') goto yy2;
-yy22:  yych = *++YYCURSOR;
+   goto yy22;
+yy22:  ++YYCURSOR;
+   goto yy23;
 yy23:
-#line 503
-   {
+#line 503 /usr/src/php/php5/ext/standard/var_unserializer.re
+{
size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
zend_class_entry **pce;
int incomplete_class = 0;
+
int custom_object = 0;
-/* */  
+
zval *user_func;
zval *retval_ptr;
zval **args[1];
@@ -617,9 +630,11 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
+#line 284 stdout
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
+   goto yy25;
} else {
if(yych = '-') goto yy25;
if(yych = '/') goto yy2;
@@ -629,24 +644,30 @@
 yy25:  yych = *++YYCURSOR;
if(yych = '/') goto yy2;
if(yych = ':') goto yy2;
+   goto yy26;
 yy26:  ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
+   goto yy27;
 yy27:  if(yych = '/') goto yy2;
if(yych = '9') goto yy26;
if(yych = ';') goto yy2;
+   goto yy28;
 yy28:  yych = *++YYCURSOR;
if(yych != '') goto yy2;
-yy29:  yych = *++YYCURSOR;
+   goto yy29;
+yy29:  ++YYCURSOR;
+   goto yy30;
 yy30:
-#line 495
-   {
+#line 495 /usr/src/php/php5/ext/standard/var_unserializer.re
+{
 
INIT_PZVAL(*rval);

return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
+#line 322 stdout
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -655,18 

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli_nonapi.c

[Ilia Alshanetsky]

iliaa   Thu Feb 24 18:59:51 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_nonapi.c 
/php-srcNEWS 
  Log:
  MFH: Fixed bug #32081 (default socket value is not being used).
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.34.2.4r2=1.34.2.5ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.4 
php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.5
--- php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.4 Mon Nov  1 04:52:04 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c  Thu Feb 24 18:59:49 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_nonapi.c,v 1.34.2.4 2004/11/01 09:52:04 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.34.2.5 2005/02/24 23:59:49 iliaa Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -74,6 +74,10 @@
RETURN_FALSE;
}
 
+   if (!socket) {
+   socket = MyG(default_socket);
+   }
+
if 
(mysql_real_connect(mysql-mysql,hostname,username,passwd,dbname,port,socket,CLIENT_MULTI_RESULTS)
 == NULL) {
/* Save error messages */
 
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.261r2=1.1760.2.262ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.261 php-src/NEWS:1.1760.2.262
--- php-src/NEWS:1.1760.2.261   Wed Feb 23 07:33:47 2005
+++ php-src/NEWSThu Feb 24 18:59:50 2005
@@ -25,6 +25,7 @@
   is passed. (Tony)
 - Fixed posix_getsid()  posix_getpgid() to return sid  pgid instead 
   of true. (Tony)
+- Fixed bug #32081 (in mysqli default socket value is not being used). (Ilia)
 - Fixed bug #32021 (Crash caused by range('', 'z')). (Derick)
 - Fixed bug #32011 (Fragments which replaced Nodes are not globaly useable).
   (Rob)

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

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

[Marcus Boerger]

helly   Thu Feb 24 15:22:19 2005 EDT

  Modified files:  
/php-src/ext/standard   image.c 
  Log:
  - This must be == 1
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.105r2=1.106ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.105 php-src/ext/standard/image.c:1.106
--- php-src/ext/standard/image.c:1.105  Wed Feb 23 19:12:15 2005
+++ php-src/ext/standard/image.cThu Feb 24 15:22:18 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.105 2005/02/24 00:12:15 helly Exp $ */
+/* $Id: image.c,v 1.106 2005/02/24 20:22:18 helly Exp $ */
 
 #include php.h
 #include stdio.h
@@ -687,7 +687,7 @@
break;
}
 
-   if (box_length = 1) {
+   if (box_length == 1) {
/* We won't handle XLBoxes */
return NULL;
}

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

[PHP-CVS] cvs: php-src(PHP_5_0) /win32/build Makefile

[Edin Kadribasic]

edink   Thu Feb 24 18:31:37 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/win32/buildMakefile 
  Log:
  MFH: Offical zip files have -Win32 suffix
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.1r2=1.23.2.2ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.23.2.1 
php-src/win32/build/Makefile:1.23.2.2
--- php-src/win32/build/Makefile:1.23.2.1   Fri Jan 21 22:38:41 2005
+++ php-src/win32/build/MakefileThu Feb 24 18:31:37 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.23.2.1 2005/01/22 03:38:41 edink Exp $
+# $Id: Makefile,v 1.23.2.2 2005/02/24 23:31:37 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -73,7 +73,7 @@
 clean: clean-sapi
@echo Cleaning build dirs
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.*  
NUL
-   [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib 
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip  NUL
+   [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib 
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) 
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip 
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip  NUL
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) 
 
 clean-pecl:
@@ -95,13 +95,14 @@
 build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
+   -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
+   -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING).zip .
+   -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
 
 dist: all build-dist

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

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

[Marcus Boerger]

Hello Antony,

  well it actually wasn't me and not this commit - but it was co-work!

  so i'll have a look :-)

marcus

Thursday, February 24, 2005, 12:09:25 PM, you wrote:

 On Thu, 24 Feb 2005 00:12:15 -
 Marcus Boerger [EMAIL PROTECTED] wrote:

 helly Wed Feb 23 19:12:15 2005 EDT
 
   Modified files:  
 /php-src/ext/standard image.c 
   Log:
   - Prevent superflous memory allocation

 Marcus, this patch breaks JP2 support.

 See these tests (they fail with the patch):
 php-src/ext/standard/tests/image/getimagesize.phpt
 php-src/ext/standard/tests/image/image_type_to_mime_type.phpt

   
 http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.104r2=1.105ty=u
 Index: php-src/ext/standard/image.c
 diff -u php-src/ext/standard/image.c:1.104
 php-src/ext/standard/image.c:1.105 ---
 php-src/ext/standard/image.c:1.104Wed Feb 23 18:39:36 2005 +++
 php-src/ext/standard/image.c   Wed Feb 23 19:12:15 2005
 @@ -17,7 +17,7 @@
 +
 --+
   */
  
 -/* $Id: image.c,v 1.104 2005/02/23 23:39:36 iliaa Exp $ */
 +/* $Id: image.c,v 1.105 2005/02/24 00:12:15 helly Exp $ */
  
  #include php.h
  #include stdio.h
 @@ -867,10 +867,11 @@
   */
  static struct gfxinfo *php_handle_iff(php_stream * stream TSRMLS_DC)
  {
 - struct gfxinfo *result = NULL;
 + struct gfxinfo * result;
   unsigned char a[10];
   int chunkId;
   int size;
 + short width, height, bits;
  
   if (php_stream_read(stream, a, 8) != 8) {
   return NULL;
 @@ -893,18 +894,20 @@
   size++;
   }
   if (chunkId == 0x424d4844) { /* BMHD chunk */
 - if (php_stream_read(stream, a, 9) != 9) {
 + if (size  9 || php_stream_read(stream, a, 9) != 9) {
   return NULL;
   }
 - result = (struct gfxinfo *) ecalloc(1, sizeof(struct
 gfxinfo)); -  result-width= php_ifd_get16s(a+0, 1);
 - result-height   = php_ifd_get16s(a+2, 1);
 - result-bits = a[8]  0xff;
 - result-channels = 0;
 - if (result-width  0  result-height  0 
 result-bits  0  result-bits  33) { +width  =
 php_ifd_get16s(a+0, 1); + height = php_ifd_get16s(a+2, 
 1);
 + bits   = a[8]  0xff;
 + if (width  0  height  0  bits  0  bits  33) {
 + result = (struct gfxinfo *) ecalloc(1, 
 sizeof(struct
 gfxinfo)); +  result-width= width;
 + result-height   = height;
 + result-bits = bits;
 + result-channels = 0;
   return result;
   }
 - efree(result);
   } else {
   if (php_stream_seek(stream, size, SEEK_CUR)) {
   return NULL;
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 





-- 
Best regards,
 Marcusmailto:[EMAIL PROTECTED]

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

[PHP-CVS] cvs: php-src /ext/exif config.w32

[Marcus Boerger]

helly   Thu Feb 24 20:17:46 2005 EDT

  Modified files:  
/php-src/ext/exif   config.w32 
  Log:
  - Change to enable (synch with unix build system)
  
http://cvs.php.net/diff.php/php-src/ext/exif/config.w32?r1=1.2r2=1.3ty=u
Index: php-src/ext/exif/config.w32
diff -u php-src/ext/exif/config.w32:1.2 php-src/ext/exif/config.w32:1.3
--- php-src/ext/exif/config.w32:1.2 Mon Dec 22 08:16:39 2003
+++ php-src/ext/exif/config.w32 Thu Feb 24 20:17:45 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.2 2003/12/22 13:16:39 wez Exp $
+// $Id: config.w32,v 1.3 2005/02/25 01:17:45 helly Exp $
 // vim:ft=javascript
 
-ARG_WITH(exif, exif, no);
+ARG_ENABLE(exif, exif, no);
 
 if (PHP_EXIF == yes) {
EXTENSION(exif, exif.c);

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

[PHP-CVS] cvs: php-src /win32 sendmail.c

[Anantha Kesari H Y]

hyanantha   Fri Feb 25 00:57:43 2005 EDT

  Modified files:  
/php-src/win32  sendmail.c 
  Log:
  time.h is available in NetWare LibC.
  path sperator has been changed from \ to / while including 
netware\sendmail_nw.h 
  
  
http://cvs.php.net/diff.php/php-src/win32/sendmail.c?r1=1.61r2=1.62ty=u
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.61 php-src/win32/sendmail.c:1.62
--- php-src/win32/sendmail.c:1.61   Wed Jan 19 13:54:23 2005
+++ php-src/win32/sendmail.cFri Feb 25 00:57:41 2005
@@ -17,17 +17,17 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.61 2005/01/19 18:54:23 iliaa Exp $ */
+/* $Id: sendmail.c,v 1.62 2005/02/25 05:57:41 hyanantha Exp $ */
 
 #include php.h   /*php specific */
 #include stdio.h
 #include stdlib.h
 #ifndef NETWARE
 #include winsock2.h
+#include time.h
 #else  /* NETWARE */
-#include netware\sendmail_nw.h
+#include netware/sendmail_nw.h
 #endif /* NETWARE */
-#include time.h
 #include string.h
 #include math.h
 #ifndef NETWARE

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

[PHP-CVS] cvs: php-src /netware sendmail_nw.h

[Anantha Kesari H Y]

hyanantha   Fri Feb 25 01:31:07 2005 EDT

  Modified files:  
/php-src/netwaresendmail_nw.h 
  Log:
  changing the windows style path seperator in netinet\in.h to netinet/in.h
  
  
http://cvs.php.net/diff.php/php-src/netware/sendmail_nw.h?r1=1.1r2=1.2ty=u
Index: php-src/netware/sendmail_nw.h
diff -u php-src/netware/sendmail_nw.h:1.1 php-src/netware/sendmail_nw.h:1.2
--- php-src/netware/sendmail_nw.h:1.1   Fri Jan  3 06:12:40 2003
+++ php-src/netware/sendmail_nw.h   Fri Feb 25 01:31:06 2005
@@ -4,7 +4,7 @@
 #include novsock2.h
 #else
 #include sys/socket.h/* For struct sockaddr, 'PF_INET' and 'AF_INET' 
*/
-#include netinet\in.h/* For struct sockaddr_in */
+#include netinet/in.h/* For struct sockaddr_in */
 #include netdb.h /* For struct hostent */
 /*#include ws2name.h*/
 #endif /* USE_WINSOCK */

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysqli/tests bug30967.phpt

[Georg Richter]

georg   Fri Feb 25 03:42:31 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mysqli/tests   bug30967.phpt 
  Log:
  fix for bug #31939
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mysqli/tests/bug30967.phpt
diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.2 
php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.2  Sat Dec  4 04:01:34 2004
+++ php-src/ext/mysqli/tests/bug30967.phpt  Fri Feb 25 03:42:31 2005
@@ -12,7 +12,7 @@
class mysql2 extends mysql1 {
}
 
-   $mysql = new mysql2($host, root, , test);
+   $mysql = new mysql2($host, $user, $passwd, test);
 
$mysql-query(THIS DOES NOT WORK);
printf(%d\n, $mysql-errno);

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

[PHP-CVS] cvs: php-src /ext/mysqli/tests bug30967.phpt

[Georg Richter]

georg   Fri Feb 25 03:43:41 2005 EDT

  Modified files:  
/php-src/ext/mysqli/tests   bug30967.phpt 
  Log:
  fix for bug #31939
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.3r2=1.4ty=u
Index: php-src/ext/mysqli/tests/bug30967.phpt
diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.3 
php-src/ext/mysqli/tests/bug30967.phpt:1.4
--- php-src/ext/mysqli/tests/bug30967.phpt:1.3  Sat Dec  4 03:50:33 2004
+++ php-src/ext/mysqli/tests/bug30967.phpt  Fri Feb 25 03:43:41 2005
@@ -12,7 +12,7 @@
class mysql2 extends mysql1 {
}
 
-   $mysql = new mysql2($host, root, , test);
+   $mysql = new mysql2($host, $user, $passwd, test);
 
$mysql-query(THIS DOES NOT WORK);
printf(%d\n, $mysql-errno);

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/oci8 config.m4

[Antony Dovgal]

tony2001Fri Feb 25 06:32:01 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
/php-src/ext/oci8   config.m4 
  Log:
  MFH: allow building oci8 as shared
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.262r2=1.1760.2.263ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.262 php-src/NEWS:1.1760.2.263
--- php-src/NEWS:1.1760.2.262   Thu Feb 24 18:59:50 2005
+++ php-src/NEWSFri Feb 25 06:31:59 2005
@@ -9,6 +9,8 @@
 - Updated bundled oniguruma library (used for multibyte regular expression)
   to 3.7.0. (Moriyoshi)
 - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug preventing from building oci8 as shared. 
+  (stanislav dot voroniy at portavita dot nl, Tony)
   Fixed bugs:
   . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
   . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.50.2.2r2=1.50.2.3ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.50.2.2 php-src/ext/oci8/config.m4:1.50.2.3
--- php-src/ext/oci8/config.m4:1.50.2.2 Thu Dec 30 02:04:11 2004
+++ php-src/ext/oci8/config.m4  Fri Feb 25 06:32:01 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.50.2.2 2004/12/30 07:04:11 sniper Exp $
+dnl $Id: config.m4,v 1.50.2.3 2005/02/25 11:32:01 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_OCI_IF_DEFINED],[
@@ -64,13 +64,17 @@
 [  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
   install. The default DIR is ORACLE_HOME])
 
-PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
-[  --with-oci8-instant-client[=DIR]
+if test $PHP_OCI8 = no; then
+  PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+  [  --with-oci8-instant-client[=DIR]
   Include Oracle (OCI8) support using
   Oracle Instant Client. DIR is the directory with the
   Instant Client libraries. On Linux it will default to
   /usr/lib/oracle/most_recent_version/client/lib
   Other platforms will need to have it explicitly 
specified.])
+else 
+  PHP_OCI8_INSTANT_CLIENT=no;
+fi
 
 if test $PHP_OCI8 != no; then
 

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

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

[Antony Dovgal]

tony2001Fri Feb 25 06:31:12 2005 EDT

  Modified files:  
/php-src/ext/oci8   config.m4 
  Log:
  fix bug preventing from building oci8 as shared module 
  (patch by stanislav dot voroniy at portavita dot nl)
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.53r2=1.54ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.53 php-src/ext/oci8/config.m4:1.54
--- php-src/ext/oci8/config.m4:1.53 Thu Dec 30 02:08:37 2004
+++ php-src/ext/oci8/config.m4  Fri Feb 25 06:31:10 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.53 2004/12/30 07:08:37 sniper Exp $
+dnl $Id: config.m4,v 1.54 2005/02/25 11:31:10 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_OCI_IF_DEFINED],[
@@ -80,13 +80,17 @@
 [  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
   install. The default DIR is ORACLE_HOME])
 
-PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
-[  --with-oci8-instant-client[=DIR]
+if test $PHP_OCI8 = no; then
+  PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+  [  --with-oci8-instant-client[=DIR]
   Include Oracle (OCI8) support using
   Oracle Instant Client. DIR is the directory with the
   Instant Client libraries. On Linux it will default to
   /usr/lib/oracle/most_recent_version/client/lib
   Other platforms will need to have it explicitly 
specified.])
+else 
+  PHP_OCI8_INSTANT_CLIENT=no;
+fi
 
 if test $PHP_OCI8 != no; then
   if test $PHP_OCI8_INSTANT_CLIENT != no; then

-- 
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 /ext/oci8 config.m4

[Antony Dovgal]

tony2001Fri Feb 25 06:33:25 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/oci8   config.m4 
  Log:
  MFH: allow building oci8 as shared
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.843r2=1.1247.2.844ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.843 php-src/NEWS:1.1247.2.844
--- php-src/NEWS:1.1247.2.843   Tue Feb 22 10:00:48 2005
+++ php-src/NEWSFri Feb 25 06:33:23 2005
@@ -152,6 +152,8 @@
 - Updated PCRE to provide better error handling in certain cases. (Andrei)
 - NSAPI: added bucket parameter to list of non-php.ini-keys of php4_execute 
   for doing performance stats without warnings in server-log. (Uwe Schindler)
+- Fixed bug preventing from building oci8 as shared. 
+  (stanislav dot voroniy at portavita dot nl, Tony)
 - Fixed leap year checking with idate(). (Christian Schneider, Derick)
 - Fixed strip_tags() to correctly handle '\0' characters. (Stefan)
 - Fixed funny forking effect in FastCGI when PHP_FCGI_CHILDREN was not set.
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.37.2.11r2=1.37.2.12ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.37.2.11 
php-src/ext/oci8/config.m4:1.37.2.12
--- php-src/ext/oci8/config.m4:1.37.2.11Thu Dec 30 02:02:18 2004
+++ php-src/ext/oci8/config.m4  Fri Feb 25 06:33:24 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.37.2.11 2004/12/30 07:02:18 sniper Exp $
+dnl $Id: config.m4,v 1.37.2.12 2005/02/25 11:33:24 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_OCI_IF_DEFINED],[
@@ -64,13 +64,17 @@
 [  --with-oci8[=DIR]   Include Oracle (OCI8) support using an ORACLE_HOME
   install. The default DIR is ORACLE_HOME])
 
-PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
-[  --with-oci8-instant-client[=DIR]
+if test $PHP_OCI8 = no; then
+  PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle 
Instant Client,
+  [  --with-oci8-instant-client[=DIR]
   Include Oracle (OCI8) support using
   Oracle Instant Client. DIR is the directory with the
   Instant Client libraries. On Linux it will default to
   /usr/lib/oracle/most_recent_version/client/lib
   Other platforms will need to have it explicitly 
specified.])
+else 
+  PHP_OCI8_INSTANT_CLIENT=no;
+fi
 
 if test $PHP_OCI8 != no; then
 

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/interbase interbase.c

[Ard Biesheuvel]

abies   Fri Feb 25 08:44:26 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/interbase  interbase.c 
  Log:
  MFH: bug #31597
  
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.223r2=1.223.2.1ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.223 
php-src/ext/interbase/interbase.c:1.223.2.1
--- php-src/ext/interbase/interbase.c:1.223 Tue Jul  6 09:46:18 2004
+++ php-src/ext/interbase/interbase.c   Fri Feb 25 08:44:26 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.223 2004/07/06 13:46:18 abies Exp $ */
+/* $Id: interbase.c,v 1.223.2.1 2005/02/25 13:44:26 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -591,7 +591,7 @@
dpb = dpb_buffer + 1;
 
for (i = 0; i  sizeof(dpb_args); ++i) {
-   if (dpb_args[i]  args[i]) {
+   if (dpb_args[i]  args[i]  len[i]) {
dpb += sprintf(dpb, %c%c%s, dpb_args[i],(unsigned 
char)len[i],args[i]);
}
}

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

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

[Marcus Boerger]

helly   Fri Feb 25 15:02:47 2005 EDT

  Modified files:  
/php-src/ext/dbaconfig.m4 
  Log:
  - Align
  
http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.64r2=1.65ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.64 php-src/ext/dba/config.m4:1.65
--- php-src/ext/dba/config.m4:1.64  Fri Jan 21 20:31:54 2005
+++ php-src/ext/dba/config.m4   Fri Feb 25 15:02:45 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.64 2005/01/22 01:31:54 sniper Exp $
+dnl $Id: config.m4,v 1.65 2005/02/25 20:02:45 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -433,7 +433,7 @@
 ])
 
 AC_ARG_WITH(inifile,
-[  --with-inifileDBA: Include INI support],[
+[  --with-inifile  DBA: Include INI support],[
   if test $withval != no; then
 PHP_DBA_BUILTIN_INI
   fi
@@ -454,7 +454,7 @@
 dnl FlatFile check must be the last one.
 dnl
 AC_ARG_WITH(flatfile,
-[  --with-flatfile   DBA: Include FlatFile support],[
+[  --with-flatfile DBA: Include FlatFile support],[
   if test $withval != no; then
 PHP_DBA_BUILTIN_FLATFILE
   fi

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

Re: [PHP-CVS] cvs: php-src /win32/build Makefile config.w32

[Andi Gutmans]

Thanks Edin. This is very useful!
At 12:20 AM 2/25/2005 +, Edin Kadribasic wrote:
edink   Thu Feb 24 19:20:20 2005 EDT
  Modified files:
/php-src/win32/buildMakefile config.w32
  Log:
  Added --enable-debug-pack which will create a zip file with *.pdb debug
  symbol files. Could be used to allow windows users to use free Microsoft
  debugging tools to generate useful backtraces.
  Debug tools can be found at:
  http://www.microsoft.com/whdc/devtools/debugging/installx86.mspx
  CLAGS used described in:
  http://support.microsoft.com/default.aspx?scid=kb;en-us;291585
  Only tested on VC 6.0.
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.30r2=1.31ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.30 php-src/win32/build/Makefile:1.31
--- php-src/win32/build/Makefile:1.30   Thu Feb 24 18:28:49 2005
+++ php-src/win32/build/MakefileThu Feb 24 19:20:19 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.30 2005/02/24 23:28:49 edink Exp $
+# $Id: Makefile,v 1.31 2005/02/25 00:20:19 edink Exp $
 # This is the makefile template for the win32 build
 CC=$(CL)
@@ -107,6 +107,7 @@
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -115,6 +116,9 @@
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
+   cd $(BUILD_DIR)
+   -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+   cd ..\..

 dist: all build-dist
 snap: build-snap build-dist
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.36r2=1.37ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.36 
php-src/win32/build/config.w32:1.37
--- php-src/win32/build/config.w32:1.36 Tue Feb 15 08:57:49 2005
+++ php-src/win32/build/config.w32  Thu Feb 24 19:20:19 2005
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.36 2005/02/15 13:57:49 edink Exp $
+// $Id: config.w32,v 1.37 2005/02/25 00:20:19 edink Exp $
 // Master config file; think of it as a configure.in
 // equivalent.

@@ -19,8 +19,11 @@
 PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
 ARG_ENABLE('debug', 'Compile with debugging symbols', no);
+ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols 
(--enable-debug must not be specified)', 'no');
+if (PHP_DEBUG == yes  PHP_DEBUG_PACK == yes) {
+   ERROR(Use of both --enable-debug and --enable-debug-pack not 
allowed.);
+}
 ARG_ENABLE('zts', 'Thread safety', 'yes');
-
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
@@ -64,6 +67,11 @@
// version of the libc
ADD_FLAG(PHP_LDFLAGS, /nodefaultlib:msvcrt);
 } else {
+   // Generate external debug files when --enable-debug-pack is specified
+   if (PHP_DEBUG_PACK == yes) {
+   ADD_FLAG(CFLAGS, /Zi);
+   ADD_FLAG(LDFLAGS, /incremental:no /debug /opt:ref,icf);
+   }
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /Ox /D NDebug /D NDEBUG \
 /D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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

[Rob Richards]

rrichards   Fri Feb 25 17:13:38 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  no message
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.844r2=1.1247.2.845ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.844 php-src/NEWS:1.1247.2.845
--- php-src/NEWS:1.1247.2.844   Fri Feb 25 06:33:23 2005
+++ php-src/NEWSFri Feb 25 17:13:37 2005
@@ -4,6 +4,7 @@
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Changed phpize not to require libtool. (Jani)
 - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
   Fixed bugs:
   . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
   . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)

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

[PHP-CVS] cvs: php-src /ext/libxml config.w32

[Frank M. Kromann]

fmk Fri Feb 25 17:59:27 2005 EDT

  Modified files:  
/php-src/ext/libxml config.w32 
  Log:
  Kill warnings. There should be no need for this flag as it's already defined 
in libxml headers.
  
http://cvs.php.net/diff.php/php-src/ext/libxml/config.w32?r1=1.7r2=1.8ty=u
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.7 php-src/ext/libxml/config.w32:1.8
--- php-src/ext/libxml/config.w32:1.7   Wed Aug  4 12:47:17 2004
+++ php-src/ext/libxml/config.w32   Fri Feb 25 17:59:26 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2004/08/04 16:47:17 fmk Exp $
+// $Id: config.w32,v 1.8 2005/02/25 22:59:26 fmk Exp $
 // vim:ft=javascript
 
 ARG_WITH(libxml, LibXML support, yes);
@@ -10,7 +10,6 @@
 
EXTENSION(libxml, libxml.c, false /* never shared */);
AC_DEFINE(HAVE_LIBXML, 1, LibXML support);
-   ADD_FLAG(CFLAGS, /D LIBXML_THREAD_ENABLED);
ADD_FLAG(CFLAGS_LIBXML, /D LIBXML_STATIC );
if (!PHP_LIBXML_SHARED) {
ADD_DEF_FILE(ext\\libxml\\php_libxml2.def);

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

[PHP-CVS] cvs: php-src(PHP_5_0) /win32/build Makefile config.w32

[Edin Kadribasic]

edink   Fri Feb 25 18:00:17 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/win32/buildMakefile config.w32 
  Log:
  MFH: (--enable-debug-pack)
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.23.2.2r2=1.23.2.3ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.23.2.2 
php-src/win32/build/Makefile:1.23.2.3
--- php-src/win32/build/Makefile:1.23.2.2   Thu Feb 24 18:31:37 2005
+++ php-src/win32/build/MakefileFri Feb 25 18:00:17 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.23.2.2 2005/02/24 23:31:37 edink Exp $
+# $Id: Makefile,v 1.23.2.3 2005/02/25 23:00:17 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -96,6 +96,7 @@
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
+   -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -104,6 +105,9 @@
cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
+   cd $(BUILD_DIR)
+   -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+   cd ..\..
 
 dist: all build-dist
 snap: build-snap build-dist
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.26.2.7r2=1.26.2.8ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.26.2.7 
php-src/win32/build/config.w32:1.26.2.8
--- php-src/win32/build/config.w32:1.26.2.7 Tue Feb 15 09:29:01 2005
+++ php-src/win32/build/config.w32  Fri Feb 25 18:00:17 2005
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.26.2.7 2005/02/15 14:29:01 edink Exp $
+// $Id: config.w32,v 1.26.2.8 2005/02/25 23:00:17 edink Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -18,8 +18,11 @@
 PATH_PROG('lemon');
 
 ARG_ENABLE('debug', 'Compile with debugging symbols', no);
+ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols 
(--enable-debug must not be specified)', 'no');
+if (PHP_DEBUG == yes  PHP_DEBUG_PACK == yes) {
+   ERROR(Use of both --enable-debug and --enable-debug-pack not 
allowed.);
+}
 ARG_ENABLE('zts', 'Thread safety', 'yes');
-
 // Configures the hard-coded installation dir
 ARG_ENABLE('prefix', 'where PHP will be installed', '');
 if (PHP_PREFIX == '') {
@@ -63,6 +66,11 @@
// version of the libc
ADD_FLAG(PHP_LDFLAGS, /nodefaultlib:msvcrt);
 } else {
+   // Generate external debug files when --enable-debug-pack is specified
+   if (PHP_DEBUG_PACK == yes) {
+   ADD_FLAG(CFLAGS, /Zi);
+   ADD_FLAG(LDFLAGS, /incremental:no /debug /opt:ref,icf);
+   }
// Equivalent to Release_TSInline build - best optimization
ADD_FLAG(CFLAGS, /LD /MD /W3 /Ox /D NDebug /D NDEBUG \
 /D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0);

-- 
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) /ext/mssql php_mssql.c

[Frank M. Kromann]

fmk Fri Feb 25 18:23:55 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mssql  php_mssql.c 
  Log:
  FreeTDS does not have support for DBTEXTLIMIT
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.42r2=1.86.2.43ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.42 
php-src/ext/mssql/php_mssql.c:1.86.2.43
--- php-src/ext/mssql/php_mssql.c:1.86.2.42 Thu Dec 16 16:48:17 2004
+++ php-src/ext/mssql/php_mssql.c   Fri Feb 25 18:23:54 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.86.2.42 2004/12/16 21:48:17 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.43 2005/02/25 23:23:54 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -509,6 +509,7 @@
RETURN_FALSE;
}
 
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, %li, MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, 
buffer)==FAIL) {
@@ -518,6 +519,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, SET TEXTSIZE %li, 
MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);
@@ -634,6 +636,7 @@
RETURN_FALSE;
}
 
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, %li, MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, buffer)==FAIL) {
@@ -643,6 +646,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, SET TEXTSIZE %li, MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);

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

[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c

[Frank M. Kromann]

fmk Fri Feb 25 18:24:19 2005 EDT

  Modified files:  
/php-src/ext/mssql  php_mssql.c 
  Log:
  FreeTDS does not have support for DBTEXTLIMIT
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.146r2=1.147ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.146 php-src/ext/mssql/php_mssql.c:1.147
--- php-src/ext/mssql/php_mssql.c:1.146 Tue Jan 18 01:09:48 2005
+++ php-src/ext/mssql/php_mssql.c   Fri Feb 25 18:24:18 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.146 2005/01/18 06:09:48 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.147 2005/02/25 23:24:18 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -518,6 +518,7 @@
RETURN_FALSE;
}
 
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, %li, MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, 
buffer)==FAIL) {
@@ -527,6 +528,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, SET TEXTSIZE %li, 
MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mssql php_mssql.c

[Frank M. Kromann]

fmk Fri Feb 25 18:25:33 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mssql  php_mssql.c 
  Log:
  MFH: FreeTDS does not have support for DBTEXTLIMIT
  
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.7r2=1.137.2.8ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.7 
php-src/ext/mssql/php_mssql.c:1.137.2.8
--- php-src/ext/mssql/php_mssql.c:1.137.2.7 Thu Dec 16 16:49:36 2004
+++ php-src/ext/mssql/php_mssql.c   Fri Feb 25 18:25:33 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.137.2.7 2004/12/16 21:49:36 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.8 2005/02/25 23:25:33 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -513,6 +513,7 @@
RETURN_FALSE;
}
 
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, %li, MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, 
buffer)==FAIL) {
@@ -522,6 +523,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, SET TEXTSIZE %li, 
MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);
@@ -638,6 +640,7 @@
RETURN_FALSE;
}
 
+#ifndef HAVE_FREETDS
if (MS_SQL_G(textlimit) != -1) {
sprintf(buffer, %li, MS_SQL_G(textlimit));
if (DBSETOPT(mssql.link, DBTEXTLIMIT, buffer)==FAIL) {
@@ -647,6 +650,7 @@
RETURN_FALSE;
}
}
+#endif
if (MS_SQL_G(textsize) != -1) {
sprintf(buffer, SET TEXTSIZE %li, MS_SQL_G(textsize));
dbcmd(mssql.link, buffer);

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

[PHP-CVS] cvs: php-src /ext/dba config.m4 dba.c dba_db1.c php_db1.h /ext/dba/tests dba_db1.phpt

[Marcus Boerger]

helly   Fri Feb 25 18:51:53 2005 EDT

  Added files: 
/php-src/ext/dbadba_db1.c php_db1.h 
/php-src/ext/dba/tests  dba_db1.phpt 

  Modified files:  
/php-src/ext/dbaconfig.m4 dba.c 
  Log:
  - Add support for db1 through emulation
  # Most probably db4 requires a slightly different detection since functions
  # are macros which most probably doesn't work with current configure check.
  
  http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.65r2=1.66ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.65 php-src/ext/dba/config.m4:1.66
--- php-src/ext/dba/config.m4:1.65  Fri Feb 25 15:02:45 2005
+++ php-src/ext/dba/config.m4   Fri Feb 25 18:51:51 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.65 2005/02/25 20:02:45 helly Exp $
+dnl $Id: config.m4,v 1.66 2005/02/25 23:51:51 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -226,6 +226,9 @@
   AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, $THIS_INCLUDE, [ ])
 fi
   fi
+  DB$1_LIBS=$THIS_LIBS
+  DB$1_PREFIX=$THIS_PREFIX
+  DB$1_INCLUDE=$THIS_INCLUDE
   PHP_DBA_STD_ASSIGN
   PHP_DBA_STD_CHECK
   PHP_DBA_STD_ATTACH
@@ -333,6 +336,66 @@
 ])
 AC_DBA_STD_RESULT(db2,Berkeley DB2)
 
+AC_ARG_WITH(db1,
+[  --with-db1[=DIR]  DBA: Include Berkeley DB1 support/emulation],[
+  if test $withval != no; then
+PHP_DBA_STD_BEGIN
+AC_MSG_CHECKING(for DB1 in library)
+if test $HAVE_DB4 = 1; then
+  THIS_VERSION=4
+  THIS_LIBS=$DB4_LIBS
+  THIS_PREFIX=$DB4_PREFIX
+elif test $HAVE_DB3 = 1; then
+  THIS_LIBS=$DB3_LIBS
+  THIS_PREFIX=$DB3_PREFIX
+elif test $HAVE_DB2 = 1; then
+  THIS_VERSION=2
+  THIS_LIBS=$DB2_LIBS
+  THIS_PREFIX=$DB2_PREFIX
+fi
+if test $HAVE_DB4 = 1 -o $HAVE_DB3 = 1 -o $HAVE_DB2 = 1; then
+  AC_DEFINE_UNQUOTED(DB1_VERSION, Berkeley DB 1.85 emulation in 
DB$THIS_VERSION, [ ])
+  for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h 
include/db/db_185.h; do
+if test -f $THIS_PREFIX/$i; then
+  THIS_INCLUDE=$THIS_PREFIX/$i
+  break
+fi
+  done
+else
+  AC_DEFINE_UNQUOTED(DB1_VERSION, Unknown DB1, [ ])
+  for i in $withval /usr/local /usr; do
+if test -f $i/db1/db.h; then
+  THIS_PREFIX=$i
+  THIS_INCLUDE=$i/db1/db.h
+  break
+elif test -f $i/include/db1/db.h; then
+  THIS_PREFIX=$i
+  THIS_INCLUDE=$i/include/db1/db.h
+  break
+elif test -f $i/include/db.h; then
+  THIS_PREFIX=$i
+  THIS_INCLUDE=$i/include/db.h
+  break
+fi
+  done
+  THIS_LIBS=db
+fi
+AC_MSG_RESULT($THIS_LIBS)
+AC_MSG_CHECKING(for DB1 in header)
+AC_MSG_RESULT($THIS_INCLUDE)
+if test -n $THIS_INCLUDE; then
+  PHP_CHECK_LIBRARY($THIS_LIBS, dbopen, [
+AC_DEFINE_UNQUOTED(DB1_INCLUDE_FILE, $THIS_INCLUDE, [ ])
+AC_DEFINE(DBA_DB1, 1, [ ]) 
+  ])
+fi
+PHP_DBA_STD_ASSIGN
+PHP_DBA_STD_CHECK
+PHP_DBA_STD_ATTACH
+  fi
+])
+AC_DBA_STD_RESULT(db1,DB1)
+
 AC_ARG_WITH(dbm,
 [  --with-dbm[=DIR]  DBA: Include DBM support],[
   if test $withval != no; then
@@ -469,7 +532,7 @@
 if test $HAVE_DBA = 1; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c 
dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c 
$cdb_sources $flat_sources $ini_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c 
$cdb_sources $flat_sources $ini_sources, $ext_shared)
   PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
   PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
http://cvs.php.net/diff.php/php-src/ext/dba/dba.c?r1=1.109r2=1.110ty=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.109 php-src/ext/dba/dba.c:1.110
--- php-src/ext/dba/dba.c:1.109 Thu Jan  8 03:14:39 2004
+++ php-src/ext/dba/dba.c   Fri Feb 25 18:51:51 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dba.c,v 1.109 2004/01/08 08:14:39 andi Exp $ */
+/* $Id: dba.c,v 1.110 2005/02/25 23:51:51 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -43,6 +43,7 @@
 #include php_ndbm.h
 #include php_dbm.h
 #include php_cdb.h
+#include php_db1.h
 #include php_db2.h
 #include php_db3.h
 #include php_db4.h
@@ -239,6 +240,9 @@
 #if DBA_CDB_BUILTIN
 DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in 
lib */
 #endif
+#if DBA_DB1
+   DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */
+#endif
 #if DBA_DB2
DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */
 #endif
@@ -268,6 +272,8 @@
 #define DBA_DEFAULT db3
 #elif DBA_DB2
 #define DBA_DEFAULT db2
+#elif DBA_DB1
+#define 

[PHP-CVS] cvs: php-src /win32/build mkdist.php

[Edin Kadribasic]

edink   Fri Feb 25 19:37:10 2005 EDT

  Modified files:  
/php-src/win32/buildmkdist.php 
  Log:
  Added .reg files to the disto (were added manually)
  
http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.11r2=1.12ty=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.11 php-src/win32/build/mkdist.php:1.12
--- php-src/win32/build/mkdist.php:1.11 Sat Jul 31 14:59:50 2004
+++ php-src/win32/build/mkdist.php  Fri Feb 25 19:37:10 2005
@@ -1,4 +1,4 @@
-?php # $Id: mkdist.php,v 1.11 2004/07/31 18:59:50 wez Exp $
+?php # $Id: mkdist.php,v 1.12 2005/02/26 00:37:10 edink Exp $
 /* piece together a windows binary distro */
 
 $build_dir = $argv[1];
@@ -222,6 +222,8 @@
php.ini-dist =   php.ini-dist,
php.ini-recommended = php.ini-recommended,
win32/install.txt =  install.txt,
+   win32/pws-php5cgi.reg = pws-php5cgi.reg,
+   win32/pws-php5isapi.reg = pws-php5isapi.reg,
 );
 
 foreach ($text_files as $src = $dest) {

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

[PHP-CVS] cvs: php-src(PHP_5_0) /win32/build mkdist.php

[Edin Kadribasic]

edink   Fri Feb 25 19:38:28 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/win32/buildmkdist.php 
  Log:
  MFH: Added .reg files to the disto (were added manually)
  
http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.10r2=1.10.2.1ty=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.10 
php-src/win32/build/mkdist.php:1.10.2.1
--- php-src/win32/build/mkdist.php:1.10 Thu Apr  8 09:36:11 2004
+++ php-src/win32/build/mkdist.php  Fri Feb 25 19:38:27 2005
@@ -1,4 +1,4 @@
-?php # $Id: mkdist.php,v 1.10 2004/04/08 13:36:11 wez Exp $
+?php # $Id: mkdist.php,v 1.10.2.1 2005/02/26 00:38:27 edink Exp $
 /* piece together a windows binary distro */
 
 $build_dir = $argv[1];
@@ -222,6 +222,8 @@
php.ini-dist =   php.ini-dist,
php.ini-recommended = php.ini-recommended,
win32/install.txt =  install.txt,
+   win32/pws-php5cgi.reg = pws-php5cgi.reg,
+   win32/pws-php5isapi.reg = pws-php5isapi.reg,
 );
 
 foreach ($text_files as $src = $dest) {

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

[PHP-CVS] cvs: php-src /ext/dba config.w32

[Marcus Boerger]

helly   Fri Feb 25 20:05:34 2005 EDT

  Modified files:  
/php-src/ext/dbaconfig.w32 
  Log:
  - Prepare for db1.85 emulation with db3
  
http://cvs.php.net/diff.php/php-src/ext/dba/config.w32?r1=1.2r2=1.3ty=u
Index: php-src/ext/dba/config.w32
diff -u php-src/ext/dba/config.w32:1.2 php-src/ext/dba/config.w32:1.3
--- php-src/ext/dba/config.w32:1.2  Tue Dec 23 09:05:33 2003
+++ php-src/ext/dba/config.w32  Fri Feb 25 20:05:33 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/23 14:05:33 wez Exp $
+// $Id: config.w32,v 1.3 2005/02/26 01:05:33 helly Exp $
 // vim:ft=javascript
 
 ARG_WITH(dba, DBA support, no);
@@ -6,12 +6,12 @@
 if (PHP_DBA != no) {
if (CHECK_LIB(libdb31s.lib, dba, PHP_DBA) 
CHECK_HEADER_ADD_INCLUDE(db.h, CFLAGS_DBA)) {
-   EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c 
dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c);
+   EXTENSION(dba, dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c 
dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c);
ADD_SOURCES(ext/dba/libcdb, cdb.c cdb_make.c uint32.c, 
dba);
ADD_SOURCES(ext/dba/libflatfile, flatfile.c, dba);
ADD_SOURCES(ext/dba/libinifile, inifile.c, dba);
AC_DEFINE('HAVE_DBA', 1, 'DBA support');
-   ADD_FLAG(CFLAGS_DBA, /D DBA_DB3=1 /D 
DB3_INCLUDE_FILE=db.h /D DBA_FLATFILE=1 /D DBA_CDB=1 /D 
DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1);
+   ADD_FLAG(CFLAGS_DBA, /D DBA_DB1=0 /D 
DB1_VERSION=Berkeley DB 1.85 emulation in DB3 /D 
DB1_INCLUDE_FILE=db_185.h /D DBA_DB3=1 /D 
DB3_INCLUDE_FILE=db.h /D DBA_FLATFILE=1 /D DBA_CDB=1 /D 
DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1);
} else {
WARNING(dba not enabled; libraries and headers not found);
}

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

[PHP-CVS] cvs: php-src /win32/build Makefile confutils.js

[Edin Kadribasic]

edink   Fri Feb 25 20:07:48 2005 EDT

  Modified files:  
/php-src/win32/buildMakefile confutils.js 
  Log:
  Allow arbitrary files to be added to distro with ADD_DIST_FILE(filename)
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.31r2=1.32ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.31 php-src/win32/build/Makefile:1.32
--- php-src/win32/build/Makefile:1.31   Thu Feb 24 19:20:19 2005
+++ php-src/win32/build/MakefileFri Feb 25 20:07:48 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.31 2005/02/25 00:20:19 edink Exp $
+# $Id: Makefile,v 1.32 2005/02/26 01:07:48 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
@@ -109,7 +109,7 @@
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
-   $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PECL_TARGETS) 
$(SNAPSHOT_TEMPLATE)
+   $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR) 
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES) 
$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
cd ..\..
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.54r2=1.55ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.54 
php-src/win32/build/confutils.js:1.55
--- php-src/win32/build/confutils.js:1.54   Sun Feb 13 16:38:39 2005
+++ php-src/win32/build/confutils.jsFri Feb 25 20:07:48 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.54 2005/02/13 21:38:39 wez Exp $
+// $Id: confutils.js,v 1.55 2005/02/26 01:07:48 edink Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -917,6 +917,15 @@
MFO.WriteBlankLines(1);
 }
 
+function ADD_DIST_FILE(filename)
+{
+   if (configure_module_dirname.match(pecl)) {
+   ADD_FLAG(PECL_EXTRA_DIST_FILES, filename);
+   } else {
+   ADD_FLAG(PHP_EXTRA_DIST_FILES, filename);
+   }
+}  
+
 function file_get_contents(filename)
 {
var f, c;

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

[PHP-CVS] cvs: php-src /ext/dba dba_db1.c

[Marcus Boerger]

helly   Fri Feb 25 21:06:49 2005 EDT

  Modified files:  
/php-src/ext/dbadba_db1.c 
  Log:
  - Simplify
  
http://cvs.php.net/diff.php/php-src/ext/dba/dba_db1.c?r1=1.1r2=1.2ty=u
Index: php-src/ext/dba/dba_db1.c
diff -u php-src/ext/dba/dba_db1.c:1.1 php-src/ext/dba/dba_db1.c:1.2
--- php-src/ext/dba/dba_db1.c:1.1   Fri Feb 25 18:51:51 2005
+++ php-src/ext/dba/dba_db1.c   Fri Feb 25 21:06:49 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dba_db1.c,v 1.1 2005/02/25 23:51:51 helly Exp $ */
+/* $Id: dba_db1.c,v 1.2 2005/02/26 02:06:49 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -31,7 +31,6 @@
 #include DB1_INCLUDE_FILE
 #endif
 
-#include unistd.h
 #include sys/types.h
 #include sys/stat.h
 #include fcntl.h
@@ -101,14 +100,12 @@
DB1_DATA;
DB1_GKEY;
 
-   char *new = NULL;
-
memset(gval, 0, sizeof(gval));
if (dba-dbp-get(dba-dbp, gkey, gval, 0) == RET_SUCCESS) {
if (newlen) *newlen = gval.size;
-   new = estrndup(gval.data, gval.size);
+   return estrndup(gval.data, gval.size);
}
-   return new;
+   return NULL;
 }
 
 DBA_UPDATE_FUNC(db1)
@@ -146,17 +143,14 @@
DBT gval;
DB1_DATA;
 
-   char *key = NULL;
-
memset(gkey, 0, sizeof(gkey));
memset(gval, 0, sizeof(gval));
 
if (dba-dbp-seq(dba-dbp, gkey, gval, R_FIRST) == RET_SUCCESS) {
if (newlen) *newlen = gkey.size;
-   key = estrndup(gkey.data, gkey.size);
+   return estrndup(gkey.data, gkey.size);
}
-
-   return key;
+   return NULL;
 }
 
 DBA_NEXTKEY_FUNC(db1)
@@ -165,16 +159,14 @@
DBT gval;
DB1_DATA;
 
-   char *key = NULL;
-
memset(gkey, 0, sizeof(gkey));
memset(gval, 0, sizeof(gval));
 
if (dba-dbp-seq(dba-dbp, gkey, gval, R_NEXT) == RET_SUCCESS) {
if (newlen) *newlen = gkey.size;
-   key = estrndup(gkey.data, gkey.size);
+   return estrndup(gkey.data, gkey.size);
}
-   return key;
+   return NULL;
 }
 
 DBA_OPTIMIZE_FUNC(db1)

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

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

[Marcus Boerger]

helly   Fri Feb 25 21:15:01 2005 EDT

  Modified files:  
/php-src/ext/dbaconfig.m4 
  Log:
  - Make detection work for macros
  
http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.66r2=1.67ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.66 php-src/ext/dba/config.m4:1.67
--- php-src/ext/dba/config.m4:1.66  Fri Feb 25 18:51:51 2005
+++ php-src/ext/dba/config.m4   Fri Feb 25 21:15:00 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.66 2005/02/25 23:51:51 helly Exp $
+dnl $Id: config.m4,v 1.67 2005/02/26 02:15:00 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -384,9 +384,18 @@
 AC_MSG_CHECKING(for DB1 in header)
 AC_MSG_RESULT($THIS_INCLUDE)
 if test -n $THIS_INCLUDE; then
-  PHP_CHECK_LIBRARY($THIS_LIBS, dbopen, [
-AC_DEFINE_UNQUOTED(DB1_INCLUDE_FILE, $THIS_INCLUDE, [ ])
-AC_DEFINE(DBA_DB1, 1, [ ]) 
+  PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$THIS_LIBS,[
+AC_TRY_LINK([
+#include $THIS_INCLUDE
+],[
+  DB * dbp = dbopen(, 0, 0, DB_HASH, 0);
+],[
+  AC_DEFINE_UNQUOTED(DB1_INCLUDE_FILE, $THIS_INCLUDE, [ ])
+  AC_DEFINE(DBA_DB1, 1, [ ])
+  THIS_RESULT=yes
+],[
+  THIS_RESULT=no
+])
   ])
 fi
 PHP_DBA_STD_ASSIGN

-- 
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) /ext/domxml php_domxml.c

[Rob Richards]

rrichards   Fri Feb 25 17:13:09 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c 
  Log:
  no message
  
http://cvs.php.net/diff.php/php-src/ext/domxml/php_domxml.c?r1=1.218.2.48r2=1.218.2.49ty=u
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.48 
php-src/ext/domxml/php_domxml.c:1.218.2.49
--- php-src/ext/domxml/php_domxml.c:1.218.2.48  Fri Aug 13 07:38:03 2004
+++ php-src/ext/domxml/php_domxml.c Fri Feb 25 17:13:08 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_domxml.c,v 1.218.2.48 2004/08/13 11:38:03 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.49 2005/02/25 22:13:08 rrichards Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -2471,6 +2471,10 @@
}
/* end libxml2 code */
else if (child-type == XML_ATTRIBUTE_NODE) {
+   if (parent-type != XML_ELEMENT_NODE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Element 
node required to append Attribute);
+   RETURN_FALSE;
+   }
if (parent-properties != NULL) {
/* Check if an attribute with the same name exists */
xmlAttrPtr foundattrp;

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