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

2005-02-03 Thread Jani Taskinen
sniper  Thu Feb  3 10:46:15 2005 EDT

  Modified files:  
/php-srcEXTENSIONS 
  Log:
  cleanup
  
http://cvs.php.net/diff.php/php-src/EXTENSIONS?r1=1.70r2=1.71ty=u
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.70 php-src/EXTENSIONS:1.71
--- php-src/EXTENSIONS:1.70 Fri Jan  7 00:39:27 2005
+++ php-src/EXTENSIONS  Thu Feb  3 10:46:15 2005
@@ -302,11 +302,6 @@
 STATUS:  Working
 SINCE:   4.0.2
 ---
-EXTENSION:   dio
-MAINTENANCE: Orphaned
-STATUS:  Working
-SINCE:   4.0.6

 EXTENSION:   exif
 PRIMARY MAINTAINER:  Marcus Boerger [EMAIL PROTECTED]
 MAINTENANCE: Maintained
@@ -514,20 +509,12 @@
 MAINTENANCE: Unknown
 STATUS:  Unknown
 ---
-EXTENSION:   w32api
-MAINTENANCE: Unknown
-STATUS:  Experimental

 EXTENSION:   yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss [EMAIL PROTECTED]
 MAINTENANCE: Maintained
 STATUS:  Unknown
 SINCE:   4.0.1
 ---
-EXTENSION:   yp
-MAINTENANCE: Unknown
-STATUS:  Unknown

 EXTENSION:   zlib
 PRIMARY MAINTAINER:  Stefan Roehrich [EMAIL PROTECTED]
 MAINTENANCE: Maintained


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



[PHP-CVS] cvs: php-src /ext/filepro package.xml

2005-02-03 Thread Magnus Määttä
magnus  Thu Feb  3 12:02:43 2005 EDT

  Modified files:  
/php-src/ext/filepropackage.xml 
  Log:
  Fix typos.
  
http://cvs.php.net/diff.php/php-src/ext/filepro/package.xml?r1=1.1r2=1.2ty=u
Index: php-src/ext/filepro/package.xml
diff -u php-src/ext/filepro/package.xml:1.1 php-src/ext/filepro/package.xml:1.2
--- php-src/ext/filepro/package.xml:1.1 Wed Mar 24 13:43:22 2004
+++ php-src/ext/filepro/package.xml Thu Feb  3 12:02:42 2005
@@ -2,7 +2,7 @@
 !DOCTYPE package SYSTEM ../pear/package.dtd
 package
  namefilepro/name
- summaryfilePor database access functions/summary
+ summaryfilePro database access functions/summary
  maintainers
   maintainer
user???/user

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



[PHP-CVS] cvs: php-src / buildconf /build build2.mk

2005-02-03 Thread Jani Taskinen
sniper  Thu Feb  3 12:42:42 2005 EDT

  Modified files:  
/php-srcbuildconf 
/php-src/build  build2.mk 
  Log:
  - Fix buildconf with BSD make
  
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.63r2=1.64ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.63 php-src/buildconf:1.64
--- php-src/buildconf:1.63  Wed Jan 19 18:03:29 2005
+++ php-src/buildconf   Thu Feb  3 12:42:42 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.63 2005/01/19 23:03:29 sniper Exp $
+# $Id: buildconf,v 1.64 2005/02/03 17:42:42 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case $EXTRA_VERSION in
@@ -66,4 +66,8 @@
  
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SHOW_WARNINGS=$debug
+if test $debug = yes; then
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SUPPRESS_WARNINGS=
+else
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR
+fi
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.34r2=1.35ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.34 php-src/build/build2.mk:1.35
--- php-src/build/build2.mk:1.34Wed Jan 19 20:41:19 2005
+++ php-src/build/build2.mk Thu Feb  3 12:42:42 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann [EMAIL PROTECTED] |
 #  +--+
 #
-# $Id: build2.mk,v 1.34 2005/01/20 01:41:19 sniper Exp $ 
+# $Id: build2.mk,v 1.35 2005/02/03 17:42:42 sniper Exp $ 
 #
 
 include generated_lists
@@ -32,14 +32,9 @@
 
 targets = $(TOUCH_FILES) configure $(config_h_in)
 
-ifeq ($(SHOW_WARNINGS), no)
-   SUPPRESS_WARNINGS = 21 | (egrep -v '(AC_TRY_RUN called without 
default to allow cross compiling|AC_PROG_CXXCPP was called before 
AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple 
times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
-else
-   debug_target = debugging
-endif
+SUPPRESS_WARNINGS ?= 21 | (egrep -v '(AC_TRY_RUN called without default to 
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in 
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT 
is expanded from...|the top level)'||true)
 
-
-all: $(targets) $(debug_target)
+all: $(targets)
 
 acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
@@ -63,6 +58,3 @@
@echo rebuilding $@
autoconf $(SUPPRESS_WARNINGS)
 
-debugging:
-   @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-   $$libtoolize


-- 
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) / buildconf /build build2.mk

2005-02-03 Thread Jani Taskinen
sniper  Thu Feb  3 12:42:59 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcbuildconf 
/php-src/build  build2.mk 
  Log:
  MFH: Fix buildconf with BSD make
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.62.2.1r2=1.62.2.2ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.62.2.1 php-src/buildconf:1.62.2.2
--- php-src/buildconf:1.62.2.1  Wed Jan 19 18:04:00 2005
+++ php-src/buildconf   Thu Feb  3 12:42:58 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.62.2.1 2005/01/19 23:04:00 sniper Exp $
+# $Id: buildconf,v 1.62.2.2 2005/02/03 17:42:58 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case $EXTRA_VERSION in
@@ -66,4 +66,8 @@
  
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SHOW_WARNINGS=$debug
+if test $debug = yes; then
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SUPPRESS_WARNINGS=
+else
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR
+fi
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.30.2.4r2=1.30.2.5ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.30.2.4 php-src/build/build2.mk:1.30.2.5
--- php-src/build/build2.mk:1.30.2.4Wed Jan 19 20:41:52 2005
+++ php-src/build/build2.mk Thu Feb  3 12:42:59 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann [EMAIL PROTECTED] |
 #  +--+
 #
-# $Id: build2.mk,v 1.30.2.4 2005/01/20 01:41:52 sniper Exp $ 
+# $Id: build2.mk,v 1.30.2.5 2005/02/03 17:42:59 sniper Exp $ 
 #
 
 include generated_lists
@@ -32,14 +32,9 @@
 
 targets = $(TOUCH_FILES) configure $(config_h_in)
 
-ifeq ($(SHOW_WARNINGS), no)
-   SUPPRESS_WARNINGS = 21 | (egrep -v '(AC_TRY_RUN called without 
default to allow cross compiling|AC_PROG_CXXCPP was called before 
AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple 
times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
-else
-   debug_target = debugging
-endif
+SUPPRESS_WARNINGS ?= 21 | (egrep -v '(AC_TRY_RUN called without default to 
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in 
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT 
is expanded from...|the top level)'||true)
 
-
-all: $(targets) $(debug_target)
+all: $(targets)
 
 acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
@@ -63,6 +58,3 @@
@echo rebuilding $@
autoconf $(SUPPRESS_WARNINGS)
 
-debugging:
-   @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-   $$libtoolize

-- 
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) / buildconf /build build2.mk

2005-02-03 Thread Jani Taskinen
sniper  Thu Feb  3 12:43:04 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcbuildconf 
/php-src/build  build2.mk 
  Log:
  MFH: Fix buildconf with BSD make
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.57.4.3r2=1.57.4.4ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.57.4.3 php-src/buildconf:1.57.4.4
--- php-src/buildconf:1.57.4.3  Wed Jan 19 18:04:21 2005
+++ php-src/buildconf   Thu Feb  3 12:43:04 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.57.4.3 2005/01/19 23:04:21 sniper Exp $
+# $Id: buildconf,v 1.57.4.4 2005/02/03 17:43:04 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case $EXTRA_VERSION in
@@ -66,4 +66,8 @@
  
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SHOW_WARNINGS=$debug
+if test $debug = yes; then
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR SUPPRESS_WARNINGS=
+else
+  ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags 
ZENDDIR=$ZENDDIR
+fi
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.7r2=1.27.4.8ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.27.4.7 php-src/build/build2.mk:1.27.4.8
--- php-src/build/build2.mk:1.27.4.7Wed Jan 19 20:43:18 2005
+++ php-src/build/build2.mk Thu Feb  3 12:43:04 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann [EMAIL PROTECTED] |
 #  +--+
 #
-# $Id: build2.mk,v 1.27.4.7 2005/01/20 01:43:18 sniper Exp $ 
+# $Id: build2.mk,v 1.27.4.8 2005/02/03 17:43:04 sniper Exp $ 
 #
 
 include generated_lists
@@ -32,14 +32,9 @@
 
 targets = $(TOUCH_FILES) configure $(config_h_in)
 
-ifeq ($(SHOW_WARNINGS), no)
-   SUPPRESS_WARNINGS = 21 | (egrep -v '(AC_TRY_RUN called without 
default to allow cross compiling|AC_PROG_CXXCPP was called before 
AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple 
times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
-else
-   debug_target = debugging
-endif
+SUPPRESS_WARNINGS ?= 21 | (egrep -v '(AC_TRY_RUN called without default to 
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in 
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT 
is expanded from...|the top level)'||true)
 
-
-all: $(targets) $(debug_target)
+all: $(targets)
 
 acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
@@ -63,6 +58,3 @@
@echo rebuilding $@
autoconf $(SUPPRESS_WARNINGS)
 
-debugging:
-   @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-   $$libtoolize

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



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

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 17:45:36 2005 EDT

  Modified files:  
/php-src/ext/readline   readline.c 
  Log:
  Fixed bug #31796 (readline completion handler does not handle empty return
  values).
  
  
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.38r2=1.39ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.38 
php-src/ext/readline/readline.c:1.39
--- php-src/ext/readline/readline.c:1.38Sun Sep 26 09:52:09 2004
+++ php-src/ext/readline/readline.c Thu Feb  3 17:45:36 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.38 2004/09/26 13:52:09 wez Exp $ */
+/* $Id: readline.c,v 1.39 2005/02/03 22:45:36 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -377,7 +377,7 @@
}
}
 
-   return NULL;
+   return strdup();
 }
 
 static zval *_readline_string_zval(const char *str)

-- 
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/readline readline.c

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 17:46:24 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
/php-src/ext/readline   readline.c 
  Log:
  MFH: Fixed bug #31796 (readline completion handler does not handle empty 
  return values).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.230r2=1.1760.2.231ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.230 php-src/NEWS:1.1760.2.231
--- php-src/NEWS:1.1760.2.230   Wed Feb  2 22:02:16 2005
+++ php-src/NEWSThu Feb  3 17:46:22 2005
@@ -16,6 +16,8 @@
 - Fixed posix_getsid()  posix_getpgid() to return sid  pgid instead 
   of true. (Tony)
 - Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
+- Fixed bug #31796 (readline completion handler does not handle empty return
+  values). (Ilia)
 - Fixed bug #31755 (Cannot create SOAP header in no namespace). (Dmitry)
 - Fixed bug #31747 (SOAP Digest Authentication doesn't work with 
   HTTP/1.1 100 Continue response). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.35r2=1.35.2.1ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.35 
php-src/ext/readline/readline.c:1.35.2.1
--- php-src/ext/readline/readline.c:1.35Thu Jan  8 03:17:16 2004
+++ php-src/ext/readline/readline.c Thu Feb  3 17:46:24 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.35 2004/01/08 08:17:16 andi Exp $ */
+/* $Id: readline.c,v 1.35.2.1 2005/02/03 22:46:24 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -354,7 +354,7 @@
}
}
 
-   return NULL;
+   return strdup();
 }
 
 static zval *_readline_string_zval(const char *str)

-- 
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/readline readline.c

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 17:46:55 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/readline   readline.c 
  Log:
  MFH: Fixed bug #31796 (readline completion handler does not handle empty 
  return values).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.826r2=1.1247.2.827ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.826 php-src/NEWS:1.1247.2.827
--- php-src/NEWS:1.1247.2.826   Wed Feb  2 22:02:07 2005
+++ php-src/NEWSThu Feb  3 17:46:54 2005
@@ -7,6 +7,8 @@
 - Fixed build system to always use bundled libtool files. (Jani)  
 - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
 - Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
+- Fixed bug #31796 (readline completion handler does not handle empty return
+  values). (Ilia)
 - Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
 - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
   (elod at itfais dot com)
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.31.2.1r2=1.31.2.2ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.31.2.1 
php-src/ext/readline/readline.c:1.31.2.2
--- php-src/ext/readline/readline.c:1.31.2.1Tue Dec 31 11:35:15 2002
+++ php-src/ext/readline/readline.c Thu Feb  3 17:46:55 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.31.2.1 2002/12/31 16:35:15 sebastian Exp $ */
+/* $Id: readline.c,v 1.31.2.2 2005/02/03 22:46:55 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -354,7 +354,7 @@
}
}
 
-   return NULL;
+   return strdup();
 }
 
 static zval *_readline_string_zval(const char *str)

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



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

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 19:21:50 2005 EDT

  Modified files:  
/php-src/ext/readline   readline.c 
  Log:
  Proper fix for bug #31796 .
  
  
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.39 
php-src/ext/readline/readline.c:1.40
--- php-src/ext/readline/readline.c:1.39Thu Feb  3 17:45:36 2005
+++ php-src/ext/readline/readline.c Thu Feb  3 19:21:50 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.39 2005/02/03 22:45:36 iliaa Exp $ */
+/* $Id: readline.c,v 1.40 2005/02/04 00:21:50 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -377,7 +377,7 @@
}
}
 
-   return strdup();
+   return NULL;
 }
 
 static zval *_readline_string_zval(const char *str)
@@ -420,7 +420,13 @@
 
if (call_user_function(CG(function_table), NULL, _readline_completion, 
_readline_array, 3, params TSRMLS_CC) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
-   matches = 
completion_matches(text,_readline_command_generator);
+   if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
+   matches = 
completion_matches(text,_readline_command_generator);
+   } else {
+   matches = malloc(sizeof(char *) * 2);
+   matches[0] = strdup();
+   matches[1] = '\0';
+   }
}
}


-- 
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/readline readline.c

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 19:21:58 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/readline   readline.c 
  Log:
  MFH: Proper fix for bug #31796 .
  
  
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.35.2.1r2=1.35.2.2ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.35.2.1 
php-src/ext/readline/readline.c:1.35.2.2
--- php-src/ext/readline/readline.c:1.35.2.1Thu Feb  3 17:46:24 2005
+++ php-src/ext/readline/readline.c Thu Feb  3 19:21:58 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.35.2.1 2005/02/03 22:46:24 iliaa Exp $ */
+/* $Id: readline.c,v 1.35.2.2 2005/02/04 00:21:58 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -354,7 +354,7 @@
}
}
 
-   return strdup();
+   return NULL;
 }
 
 static zval *_readline_string_zval(const char *str)
@@ -393,7 +393,13 @@
 
if (call_user_function(CG(function_table), NULL, params[0], 
_readline_array, 3, params+1 TSRMLS_CC) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
-   matches = 
completion_matches(text,_readline_command_generator);
+   if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
+   matches = 
completion_matches(text,_readline_command_generator);
+   } else {
+   matches = malloc(sizeof(char *) * 2);
+   matches[0] = strdup();
+   matches[1] = '\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/readline readline.c

2005-02-03 Thread Ilia Alshanetsky
iliaa   Thu Feb  3 19:22:04 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/readline   readline.c 
  Log:
  MFH: Proper fix for bug #31796 .
  
  
http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.31.2.2r2=1.31.2.3ty=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.31.2.2 
php-src/ext/readline/readline.c:1.31.2.3
--- php-src/ext/readline/readline.c:1.31.2.2Thu Feb  3 17:46:55 2005
+++ php-src/ext/readline/readline.c Thu Feb  3 19:22:03 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.31.2.2 2005/02/03 22:46:55 iliaa Exp $ */
+/* $Id: readline.c,v 1.31.2.3 2005/02/04 00:22:03 iliaa Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -354,7 +354,7 @@
}
}
 
-   return strdup();
+   return NULL;
 }
 
 static zval *_readline_string_zval(const char *str)
@@ -393,7 +393,13 @@
 
if (call_user_function(CG(function_table), NULL, params[0], 
_readline_array, 3, params+1 TSRMLS_CC) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
-   matches = 
completion_matches(text,_readline_command_generator);
+   if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
+   matches = 
completion_matches(text,_readline_command_generator);
+   } else {
+   matches = malloc(sizeof(char *) * 2);
+   matches[0] = strdup();
+   matches[1] = '\0';
+   }
}
}



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



[PHP-CVS] Re: Failure

2005-02-03 Thread luca . mariano

SMTP: Please confirm the attached message.



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