[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Oct 28 20:32:05 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1430 php-src/ChangeLog:1.1431 --- php-src/ChangeLog:1.1430Mon Oct 27 20:32:07 2003 +++ php-src/ChangeLog Tue Oct 28 20:32:03 2003 @@ -1,3 +1,80 @@ +2003-10-28 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/user_filters.c: + Allow userfilter instantiation to programmatically fail by returning false. + Equivalent of Cspace filter failure by returning NULL. + +2003-10-28 Andi Gutmans [EMAIL PROTECTED] + +* ZendEngine2/zend_language_parser.y: + - Head up! I'm reverting the patch which allows for expressions in constant + - declerations. Allowing the access of other constants in this code is + - flawed. We are reverting back to PHP 4's static scalars. + - Don't worry if you get the following msg when compiling: + - zend_language_parser.y contains 3 useless nonterminals and 22 useless + rules + - I didn't nuke the code in case we have some brilliant ideas after beta 2 + +2003-10-28 Sara Golemon [EMAIL PROTECTED] + +* main/streams/filter.c: + Stop looking once we've found a matching filter. + +* main/streams/filter.c: + Extend Filter matching to check wildcards at multiple levels. + Ex: foo.bar.baz.bomb + Searches: + foo.bar.baz.bomb itself, + foo.bar.baz.*, + foo.bar.*, and + foo.* + + Also changed tempvar char wildcard[128]; to an estrdup() to + deal with potential filternames longer than 127 bytes. + +2003-10-28 George Schlossnagle [EMAIL PROTECTED] + +* NEWS: + note pcntl_wait() + +2003-10-28 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_interfaces.c: + Give some freedon to c iterators but not in userspace. + +2003-10-28 George Schlossnagle [EMAIL PROTECTED] + +* ext/pcntl/config.m4 + ext/pcntl/pcntl.c + ext/pcntl/php_pcntl.h: + Added pcntl_wait, a wraspper around wait()/wait3() + +2003-10-28 Shane Caraveo [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + fix crash in do_implement_interface when compiling + pear/PHPUnit/Framework/TestCase.php line 63 + while only interface_gets_implemented is the issue in this instance, both + these vars were unitialized, causing potential other issues + +2003-10-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/sqlite/libsqlite/src/btree_rb.c: + Fixed compiler warning. + +2003-10-28 Shane Caraveo [EMAIL PROTECTED] + +* ext/dom/document.c: + fix win32 build + +2003-10-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* NEWS + ext/standard/basic_functions.c + ext/standard/php_uuencode.h + ext/standard/uuencode.c: + By popular demand renaming uu(encode/decode) to convert_uu(encode/decode). + 2003-10-27 Moriyoshi Koizumi [EMAIL PROTECTED] * ext/standard/file.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Oct 28 20:32:08 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.326 ZendEngine2/ChangeLog:1.327 --- ZendEngine2/ChangeLog:1.326 Sat Oct 25 20:32:26 2003 +++ ZendEngine2/ChangeLog Tue Oct 28 20:32:08 2003 @@ -1,3 +1,27 @@ +2003-10-28 Andi Gutmans [EMAIL PROTECTED] + +* zend_language_parser.y: + - Head up! I'm reverting the patch which allows for expressions in constant + - declerations. Allowing the access of other constants in this code is + - flawed. We are reverting back to PHP 4's static scalars. + - Don't worry if you get the following msg when compiling: + - zend_language_parser.y contains 3 useless nonterminals and 22 useless + rules + - I didn't nuke the code in case we have some brilliant ideas after beta 2 + +2003-10-28 Marcus Boerger [EMAIL PROTECTED] + +* zend_interfaces.c: + Give some freedon to c iterators but not in userspace. + +2003-10-28 Shane Caraveo [EMAIL PROTECTED] + +* zend_compile.c: + fix crash in do_implement_interface when compiling + pear/PHPUnit/Framework/TestCase.php line 63 + while only interface_gets_implemented is the issue in this instance, both + these vars were unitialized, causing potential other issues + 2003-10-25 Marcus Boerger [EMAIL PROTECTED] * zend_API.c @@ -1916,7 +1940,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.326 2003/10/26 00:32:26 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.327 2003/10/29 01:32:08 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -3640,7 +3664,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.326 2003/10/26 00:32:26 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.327 2003/10/29 01:32:08 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/main rfc1867.c
At this point we are then knowingly and blatantly violating the license. This would be extremely hard to justify if anybody calls us on it. -Rasmus On Mon, 27 Oct 2003, Derick Rethans wrote: On Sun, 26 Oct 2003, Moriyoshi Koizumi wrote: 3. the new implementation with libmbfl is well tested in PHP 5 since last August. I doubt it somewhat, since we haven't got no handful of reports from who put beta with libmbfl in action. Yeah, I'm also doubting this. Let's not do it for 4.3.4 please as it requires atleast one more RC. Derick -- 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/mbstring/libmbfl .cvsignore
sniper Tue Oct 28 10:24:17 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring/libmbfl .cvsignore Log: MFH Index: php-src/ext/mbstring/libmbfl/.cvsignore diff -u php-src/ext/mbstring/libmbfl/.cvsignore:1.3.2.1 php-src/ext/mbstring/libmbfl/.cvsignore:1.3.2.2 --- php-src/ext/mbstring/libmbfl/.cvsignore:1.3.2.1 Sat Oct 25 07:58:41 2003 +++ php-src/ext/mbstring/libmbfl/.cvsignore Tue Oct 28 10:24:16 2003 @@ -8,7 +8,6 @@ config.log config.guess config.status -config.h libtool depcomp ltmain.sh -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
gschlossnagle Tue Oct 28 14:04:39 2003 EDT Modified files: /php-srcNEWS Log: note pcntl_wait() Index: php-src/NEWS diff -u php-src/NEWS:1.1481 php-src/NEWS:1.1482 --- php-src/NEWS:1.1481 Mon Oct 27 23:02:11 2003 +++ php-src/NEWSTue Oct 28 14:04:38 2003 @@ -34,6 +34,7 @@ . array_diff_uassoc(). (Andrey) . convert_uuencode(). (Ilia) . convert_uudecode(). (Ilia) + . pcntl_wait(). (GeorgeS) - Added resume_pos context option to ftp://; wrapper. (Sara) - Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB (Patch by Novicky Marek [EMAIL PROTECTED]). (Thies) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams filter.c
pollita Tue Oct 28 16:53:00 2003 EDT
Modified files:
/php-src/main/streams filter.c
Log:
Extend Filter matching to check wildcards at multiple levels.
Ex: foo.bar.baz.bomb
Searches:
foo.bar.baz.bomb itself,
foo.bar.baz.*,
foo.bar.*, and
foo.*
Also changed tempvar char wildcard[128]; to an estrdup() to
deal with potential filternames longer than 127 bytes.
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.6 php-src/main/streams/filter.c:1.7
--- php-src/main/streams/filter.c:1.6 Tue Jun 10 16:03:42 2003
+++ php-src/main/streams/filter.c Tue Oct 28 16:52:59 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filter.c,v 1.6 2003/06/10 20:03:42 imajes Exp $ */
+/* $Id: filter.c,v 1.7 2003/10/28 21:52:59 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -217,8 +217,8 @@
/* We allow very simple pattern matching for filter factories:
- * if charset.utf-8/sjis is requested, we search first for an exact
- * match. If that fails, we try charset.*.
+ * if convert.charset.utf-8/sjis is requested, we search first for an exact
+ * match. If that fails, we try convert.charset.*, then convert.*
* This means that we don't need to clog up the hashtable with a zillion
* charsets (for example) but still be able to provide them all as filters */
PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval
*filterparams, int persistent TSRMLS_DC)
@@ -232,16 +232,23 @@
if (SUCCESS == zend_hash_find(stream_filters_hash, (char*)filtername, n,
(void**)factory)) {
filter = factory-create_filter(filtername, filterparams, persistent
TSRMLS_CC);
- } else if ((period = strchr(filtername, '.'))) {
+ } else if ((period = strrchr(filtername, '.'))) {
/* try a wildcard */
- char wildname[128];
+ char *wildname;
- PHP_STRLCPY(wildname, filtername, sizeof(wildname) - 1,
period-filtername + 1);
- strcat(wildname, *);
-
- if (SUCCESS == zend_hash_find(stream_filters_hash, wildname,
strlen(wildname), (void**)factory)) {
- filter = factory-create_filter(filtername, filterparams,
persistent TSRMLS_CC);
+ wildname = estrdup(filtername);
+ period = wildname + (period - filtername);
+ while (period) {
+ *period = '\0';
+ strcat(wildname, .*);
+ if (SUCCESS == zend_hash_find(stream_filters_hash, wildname,
strlen(wildname), (void**)factory)) {
+ filter = factory-create_filter(filtername,
filterparams, persistent TSRMLS_CC);
+ }
+
+ *period = '\0';
+ period = strrchr(wildname, '.');
}
+ efree(wildname);
}
if (filter == NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams filter.c
pollita Tue Oct 28 18:29:17 2003 EDT
Modified files:
/php-src/main/streams filter.c
Log:
Stop looking once we've found a matching filter.
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.7 php-src/main/streams/filter.c:1.8
--- php-src/main/streams/filter.c:1.7 Tue Oct 28 16:52:59 2003
+++ php-src/main/streams/filter.c Tue Oct 28 18:29:16 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filter.c,v 1.7 2003/10/28 21:52:59 pollita Exp $ */
+/* $Id: filter.c,v 1.8 2003/10/28 23:29:16 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -238,7 +238,7 @@
wildname = estrdup(filtername);
period = wildname + (period - filtername);
- while (period) {
+ while (period !filter) {
*period = '\0';
strcat(wildname, .*);
if (SUCCESS == zend_hash_find(stream_filters_hash, wildname,
strlen(wildname), (void**)factory)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard user_filters.c
pollita Tue Oct 28 18:56:58 2003 EDT
Modified files:
/php-src/ext/standard user_filters.c
Log:
Allow userfilter instantiation to programmatically fail by returning false.
Equivalent of Cspace filter failure by returning NULL.
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.20
php-src/ext/standard/user_filters.c:1.21
--- php-src/ext/standard/user_filters.c:1.20Thu Aug 7 15:53:31 2003
+++ php-src/ext/standard/user_filters.c Tue Oct 28 18:56:57 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.20 2003/08/07 19:53:31 moriyoshi Exp $ */
+/* $Id: user_filters.c,v 1.21 2003/10/28 23:56:57 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -118,6 +118,11 @@
zval *retval = NULL;
zval **tmp;
+ if (obj == NULL) {
+ /* If there's no object associated then there's nothing to dispose of
*/
+ return;
+ }
+
ZVAL_STRINGL(func_name, onclose, sizeof(onclose)-1, 0);
call_user_function_ex(NULL,
@@ -266,20 +271,12 @@
return NULL;
}
- ALLOC_INIT_ZVAL(zfilter);
- ZEND_REGISTER_RESOURCE(zfilter, filter, le_userfilters);
-
/* create the object */
ALLOC_ZVAL(obj);
object_init_ex(obj, fdat-ce);
ZVAL_REFCOUNT(obj) = 1;
PZVAL_IS_REF(obj) = 1;
- /* set the filter property */
- filter-abstract = obj;
-
- add_property_zval(obj, filter, zfilter);
-
/* filtername */
add_property_string(obj, filtername, (char*)filtername, 1);
@@ -300,8 +297,30 @@
0, NULL,
0, NULL TSRMLS_CC);
- if (retval)
+ if (retval) {
+ if (Z_TYPE_P(retval) == IS_BOOL Z_LVAL_P(retval) == 0) {
+ /* User reported filter creation error return false; */
+ zval_ptr_dtor(retval);
+
+ /* Kill the filter (safely) */
+ filter-abstract = NULL;
+ php_stream_filter_free(filter TSRMLS_CC);
+
+ /* Kill the object */
+ zval_ptr_dtor(obj);
+
+ /* Report failure to filter_alloc */
+ return NULL;
+ }
zval_ptr_dtor(retval);
+ }
+
+ /* set the filter property, this will be used during cleanup */
+ ALLOC_INIT_ZVAL(zfilter);
+ ZEND_REGISTER_RESOURCE(zfilter, filter, le_userfilters);
+ filter-abstract = obj;
+ add_property_zval(obj, filter, zfilter);
+
return filter;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard user_filters.c
pollita Tue Oct 28 19:19:58 2003 EDT
Modified files:
/php-src/ext/standard user_filters.c
Log:
Allow userspace filters to use wildcards
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.21
php-src/ext/standard/user_filters.c:1.22
--- php-src/ext/standard/user_filters.c:1.21Tue Oct 28 18:56:57 2003
+++ php-src/ext/standard/user_filters.c Tue Oct 28 19:19:57 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.21 2003/10/28 23:56:57 pollita Exp $ */
+/* $Id: user_filters.c,v 1.22 2003/10/29 00:19:57 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -246,9 +246,36 @@
/* determine the classname/class entry */
if (FAILURE == zend_hash_find(BG(user_filter_map), (char*)filtername,
strlen(filtername), (void**)fdat)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- Err, filter \%s\ is not in the user-filter map, but
somehow the user-filter-factory was invoked for it!?, filtername);
- return NULL;
+ char *period;
+
+ /* Userspace Filters using ambiguous wildcards could cause problems.
+ i.e.: myfilter.foo.bar will always call into myfilter.foo.*
+ never seeing myfilter.*
+ TODO: Allow failed userfilter creations to continue
+ scanning through the list */
+ if ((period = strrchr(filtername, '.'))) {
+ char *wildcard;
+
+ /* Search for wildcard matches instead */
+ wildcard = estrdup(filtername);
+ period = wildcard + (period - filtername);
+ while (period) {
+ *period = '\0';
+ strcat(wildcard, .*);
+ if (SUCCESS == zend_hash_find(BG(user_filter_map),
wildcard, strlen(wildcard), (void**)fdat)) {
+ period = NULL;
+ } else {
+ *period = '\0';
+ period = strrchr(wildcard, '.');
+ }
+ }
+ efree(wildcard);
+ }
+ if (fdat == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ Err, filter \%s\ is not in the user-filter
map, but somehow the user-filter-factory was invoked for it!?, filtername);
+ return NULL;
+ }
}
/* bind the classname to the actual class */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests dom005.phpt
iliaa Wed Oct 29 00:04:41 2003 EDT Modified files: /php-src/ext/dom/tests dom005.phpt Log: Fixed test. Index: php-src/ext/dom/tests/dom005.phpt diff -u php-src/ext/dom/tests/dom005.phpt:1.1 php-src/ext/dom/tests/dom005.phpt:1.2 --- php-src/ext/dom/tests/dom005.phpt:1.1 Mon Oct 27 12:36:44 2003 +++ php-src/ext/dom/tests/dom005.phpt Wed Oct 29 00:04:40 2003 @@ -15,13 +15,13 @@ --EXPECT-- --- save as XML ?xml version=1.0 standalone=yes? -!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN http://www.w3.org/TR/REC-html40/loose.dtd; +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN http://www.w3.org/TR/REC-html40/loose.dtd; htmlheadtitleHello world/title/headbodyp This is a not well-formedbr/ html files with undeclared entities /p/body/html --- save as HTML -!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN http://www.w3.org/TR/REC-html40/loose.dtd; +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN http://www.w3.org/TR/REC-html40/loose.dtd; html headtitleHello world/title/head bodyp -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext ext_skel_win32.php
fmk Wed Oct 29 00:34:01 2003 EDT
Modified files:
/php-src/extext_skel_win32.php
Log:
Fix typo in parameter
Index: php-src/ext/ext_skel_win32.php
diff -u php-src/ext/ext_skel_win32.php:1.4 php-src/ext/ext_skel_win32.php:1.5
--- php-src/ext/ext_skel_win32.php:1.4 Sun Jun 29 12:07:17 2003
+++ php-src/ext/ext_skel_win32.php Wed Oct 29 00:34:00 2003
@@ -1,5 +1,5 @@
?php
-/* $Id: ext_skel_win32.php,v 1.4 2003/06/29 16:07:17 hholzgra Exp $ */
+/* $Id: ext_skel_win32.php,v 1.5 2003/10/29 05:34:00 fmk Exp $ */
if (php_sapi_name() != cli) {
echo Please run this script using the CLI version of PHP\n;
@@ -11,7 +11,7 @@
1) Make sure you have CygWin installed
2) Adjust the $cygwin_path to match your installation
3) Change the environment cariable PATHEXT to include .PHP
- 4) run ext_skel --ext_name=...
+ 4) run ext_skel --extname=...
the first time you run this script you will be asked to
associate it with a program. chooses the CLI version of 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) /ext ext_skel_win32.php
fmk Wed Oct 29 00:34:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/extext_skel_win32.php
Log:
Fix typo in parameter
Index: php-src/ext/ext_skel_win32.php
diff -u php-src/ext/ext_skel_win32.php:1.1.2.1 php-src/ext/ext_skel_win32.php:1.1.2.2
--- php-src/ext/ext_skel_win32.php:1.1.2.1 Fri Jan 31 13:50:41 2003
+++ php-src/ext/ext_skel_win32.php Wed Oct 29 00:34:21 2003
@@ -1,5 +1,5 @@
?php
-/* $Id: ext_skel_win32.php,v 1.1.2.1 2003/01/31 18:50:41 fmk Exp $ */
+/* $Id: ext_skel_win32.php,v 1.1.2.2 2003/10/29 05:34:21 fmk Exp $ */
if (php_sapi_name() != cli) {
echo Please run this script using the CLI version of PHP\n;
@@ -11,7 +11,7 @@
1) Make sure you have CygWin installed
2) Adjust the $cygwin_path to match your installation
3) Change the environment cariable PATHEXT to include .PHP
- 4) run ext_skel --ext_name=...
+ 4) run ext_skel --extname=...
the first time you run this script you will be asked to
associate it with a program. chooses the CLI version of php.
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext ext_skel_win32.php
fmk Wed Oct 29 00:42:06 2003 EDT
Modified files:
/php-src/extext_skel_win32.php
Log:
On win32 extensions starts with php_
Index: php-src/ext/ext_skel_win32.php
diff -u php-src/ext/ext_skel_win32.php:1.5 php-src/ext/ext_skel_win32.php:1.6
--- php-src/ext/ext_skel_win32.php:1.5 Wed Oct 29 00:34:00 2003
+++ php-src/ext/ext_skel_win32.php Wed Oct 29 00:42:05 2003
@@ -1,5 +1,5 @@
?php
-/* $Id: ext_skel_win32.php,v 1.5 2003/10/29 05:34:00 fmk Exp $ */
+/* $Id: ext_skel_win32.php,v 1.6 2003/10/29 05:42:05 fmk Exp $ */
if (php_sapi_name() != cli) {
echo Please run this script using the CLI version of PHP\n;
@@ -45,6 +45,19 @@
$fp = fopen($extname/$extname.dsp, wb);
if ($fp) {
fwrite($fp, $dsp_file);
+ fclose($fp);
+ }
+}
+
+$fp = fopen($extname/$extname.php, rb);
+if ($fp) {
+ $php_file = fread($fp, filesize($extname/$extname.php));
+ fclose($fp);
+
+ $php_file = str_replace(dl(', dl('php_, $php_file);
+ $fp = fopen($extname/$extname.php, wb);
+ if ($fp) {
+ fwrite($fp, $php_file);
fclose($fp);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/skeleton skeleton.dsp
fmk Wed Oct 29 00:42:26 2003 EDT Modified files: /php-src/ext/skeleton skeleton.dsp Log: On win32 extensions starts with php_ Index: php-src/ext/skeleton/skeleton.dsp diff -u php-src/ext/skeleton/skeleton.dsp:1.4 php-src/ext/skeleton/skeleton.dsp:1.5 --- php-src/ext/skeleton/skeleton.dsp:1.4 Sun Jun 29 12:07:18 2003 +++ php-src/ext/skeleton/skeleton.dsp Wed Oct 29 00:42:26 2003 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/extname.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_extname.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline !ELSEIF $(CFG) == extname - Win32 Debug_TS @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:..\..\Debug_TS/extname.dll /libpath:..\..\Debug_TS +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:..\..\Debug_TS/php_extname.dll /libpath:..\..\Debug_TS !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
