[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c

2009-08-31 Thread Antony Dovgal 
tony2001 Mon, 31 Aug 2009 08:41:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287911

Log:
export le_socket from ext/sockets

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
U   php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U   php/php-src/trunk/ext/sockets/php_sockets.h
U   php/php-src/trunk/ext/sockets/sockets.c

Modified: php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
===
--- php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h  2009-08-31 
08:12:07 UTC (rev 287910)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h  2009-08-31 
08:41:03 UTC (rev 287911)
@@ -91,6 +91,8 @@
 };
 #endif

+PHPAPI int php_sockets_le_socket(void);
+
 /* Prototypes */
 #ifdef ilia_0 /* not needed, only causes a compiler warning */
 static int php_open_listen_sock(php_socket **php_sock, int port, int backlog 
TSRMLS_DC);

Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c  2009-08-31 08:12:07 UTC 
(rev 287910)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c  2009-08-31 08:41:03 UTC 
(rev 287911)
@@ -323,6 +323,12 @@
 /* inet_ntop should be used instead of inet_ntoa */
 int inet_ntoa_lock = 0;

+PHPAPI int php_sockets_le_socket(void) /* {{{ */
+{
+   return le_socket;
+}
+/* }}} */
+
 static void php_destroy_socket(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
 {
php_socket *php_sock = (php_socket *) rsrc-ptr;

Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-08-31 08:12:07 UTC (rev 
287910)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-08-31 08:41:03 UTC (rev 
287911)
@@ -91,6 +91,8 @@
 };
 #endif

+PHPAPI int php_sockets_le_socket(void);
+
 /* Prototypes */
 #ifdef ilia_0 /* not needed, only causes a compiler warning */
 static int php_open_listen_sock(php_socket **php_sock, int port, int backlog 
TSRMLS_DC);

Modified: php/php-src/trunk/ext/sockets/sockets.c
===
--- php/php-src/trunk/ext/sockets/sockets.c 2009-08-31 08:12:07 UTC (rev 
287910)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-08-31 08:41:03 UTC (rev 
287911)
@@ -323,6 +323,12 @@
 /* inet_ntop should be used instead of inet_ntoa */
 int inet_ntoa_lock = 0;

+PHPAPI int php_sockets_le_socket(void) /* {{{ */
+{
+   return le_socket;
+}
+/* }}} */
+
 static void php_destroy_socket(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
 {
php_socket *php_sock = (php_socket *) rsrc-ptr;

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS Zend/zend_execute_API.c

2009-08-31 Thread Jani Taskinen 
jani Mon, 31 Aug 2009 12:07:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287915

Log:
MF53: - Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when 
including files from function), see also bug #49405

Bugs: http://bugs.php.net/49000 (Closed) PHP CLI in Interactive mode (php -a) 
crashes when including files from function
  http://bugs.php.net/49405 (Open) PHP CLI (php -a) does not function 
correctly on include and related functions.
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/Zend/zend_execute_API.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-08-31 08:52:03 UTC (rev 287914)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-08-31 12:07:27 UTC (rev 287915)
@@ -13,6 +13,8 @@
 - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). (Jani)
 - Fixed bug #49144 (Import of schema from different host transmits original
   authentication details). (Dmitry)
+- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes when including
+  files from function). (Stas)
 - Fixed bug #47273 (Encoding bug in SoapServer-fault). (Dmitry)
 - Fixed bug #28038  (Sent incorrect RCPT TO commands to SMTP server) (Garrett)


Modified: php/php-src/branches/PHP_5_2/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_2/Zend/zend_execute_API.c2009-08-31 
08:52:03 UTC (rev 287914)
+++ php/php-src/branches/PHP_5_2/Zend/zend_execute_API.c2009-08-31 
12:07:27 UTC (rev 287915)
@@ -1212,13 +1212,16 @@
zval *local_retval_ptr=NULL;
zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
+   int orig_interactive = CG(interactive);

EG(return_value_ptr_ptr) = local_retval_ptr;
EG(active_op_array) = new_op_array;
EG(no_extensions)=1;
+   CG(interactive) = 0;

zend_execute(new_op_array TSRMLS_CC);

+   CG(interactive) = orig_interactive;
if (local_retval_ptr) {
if (retval_ptr) {
COPY_PZVAL_TO_ZVAL(*retval_ptr, 
local_retval_ptr);
@@ -1265,6 +1268,7 @@
zend_op *opline, *end;
zend_op *ret_opline;
zval *local_retval=NULL;
+   int orig_interactive;

if (!(CG(active_op_array)-fn_flags  ZEND_ACC_INTERACTIVE)
|| CG(active_op_array)-backpatch_count0
@@ -1314,7 +1318,10 @@

EG(return_value_ptr_ptr) = local_retval;
EG(active_op_array) = CG(active_op_array);
+   orig_interactive = CG(interactive);
+   CG(interactive) = 0;
zend_execute(CG(active_op_array) TSRMLS_CC);
+   CG(interactive) = orig_interactive;
if (local_retval) {
zval_ptr_dtor(local_retval);
}

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/string.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/string.c trunk/ext/standard/string.c

2009-08-31 Thread Ilia Alshanetsky 
iliaaMon, 31 Aug 2009 12:28:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287916

Log:
Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).

Bug: http://bugs.php.net/49361 (Verified) wordwrap works incorrectly
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/standard/string.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/string.c
U   php/php-src/trunk/ext/standard/string.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-08-31 12:07:27 UTC (rev 287915)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-08-31 12:28:46 UTC (rev 287916)
@@ -5,6 +5,8 @@

 - Fixed leak on error in popen/exec (and related functions on Windows. (Pierre)

+- Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).
+  (Ilia, code-it at mail dot ru)
 - Fixed bug #49289 (bcmath module doesn't compile with phpize configure).
   (Jani)
 - Fixed bug #49286 (php://input (php_stream_input_read) is broken). (Jani)

Modified: php/php-src/branches/PHP_5_2/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/string.c  2009-08-31 12:07:27 UTC 
(rev 287915)
+++ php/php-src/branches/PHP_5_2/ext/standard/string.c  2009-08-31 12:28:46 UTC 
(rev 287916)
@@ -836,7 +836,7 @@
laststart = lastspace = 0;
for (current = 0; current  textlen; current++) {
if (text[current] == breakchar[0]) {
-   laststart = lastspace = current;
+   laststart = lastspace = current + 1;
} else if (text[current] == ' ') {
if (current - laststart = linelength) {
newtext[current] = breakchar[0];

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-31 12:07:27 UTC (rev 287915)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-31 12:28:46 UTC (rev 287916)
@@ -30,6 +30,8 @@
 - Fixed BC break in mime_content_type(), removes the content encoding. (Scott)

 - Fixed bug #49391 (ldap.c utilizing deprecated ldap_modify_s). (Ilia)
+- Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).
+  (Ilia, code-it at mail dot ru)
 - Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre)
 - Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
   (Ilia)

Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-08-31 12:07:27 UTC 
(rev 287915)
+++ php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-08-31 12:28:46 UTC 
(rev 287916)
@@ -825,7 +825,7 @@
laststart = lastspace = 0;
for (current = 0; current  textlen; current++) {
if (text[current] == breakchar[0]) {
-   laststart = lastspace = current;
+   laststart = lastspace = current + 1;
} else if (text[current] == ' ') {
if (current - laststart = linelength) {
newtext[current] = breakchar[0];

Modified: php/php-src/trunk/ext/standard/string.c
===
--- php/php-src/trunk/ext/standard/string.c 2009-08-31 12:07:27 UTC (rev 
287915)
+++ php/php-src/trunk/ext/standard/string.c 2009-08-31 12:28:46 UTC (rev 
287916)
@@ -1034,7 +1034,7 @@
laststart = lastspace = 0;
for (current = 0; current  textlen; current++) {
if (text[current] == breakchar[0]) {
-   laststart = lastspace = current;
+   laststart = lastspace = current + 1;
} else if (text[current] == ' ') {
if (current - laststart = linelength) {
newtext[current] = breakchar[0];

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt branches/PHP_5_3/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt branches/PHP_5_3/ext/spl/tests

2009-08-31 Thread Antony Dovgal 
tony2001 Mon, 31 Aug 2009 15:32:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287921

Log:
nuke duplicated tests

Changed paths:
D   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt
D   
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt
D   
php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first.phpt
D   
php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first002.phpt
D   
php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_last.phpt
D   php/php-src/trunk/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt
D   
php/php-src/trunk/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
D   php/php-src/trunk/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt
D   
php/php-src/trunk/ext/spl/tests/spldoublylinkedlist_offsetunset_first002.phpt
D   
php/php-src/trunk/ext/spl/tests/spldoublylinkedlist_offsetunset_last.phpt

Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt	2009-08-31 13:26:14 UTC (rev 287920)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplDoublyLinkedList_shift_noParams.phpt	2009-08-31 15:32:39 UTC (rev 287921)
@@ -1,15 +0,0 @@
---TEST--
-Checks that the shift() method of DoublyLinkedList does not accept args.
---CREDITS--
-PHPNW Test Fest 2009 - Rick Ogden
---FILE--
-?php
-$ll = new SplDoublyLinkedList();
-$ll-push(1);
-$ll-push(2);
-
-var_dump($ll-shift(1));
-?
---EXPECTF--
-Warning: SplDoublyLinkedList::shift() expects exactly 0 parameters, 1 given in %s on line %d
-NULL

Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt	2009-08-31 13:26:14 UTC (rev 287920)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFixedarray_offsetExists_larger.phpt	2009-08-31 15:32:39 UTC (rev 287921)
@@ -1,15 +0,0 @@
---TEST--
-Checks that offsetExists() does not accept a value larger than the array.
---CREDITS--
- PHPNW Test Fest 2009 - Rick Ogden
---FILE--
-?php
-$ar = new SplFixedArray(3);
-$ar[0] = 1;
-$ar[1] = 2;
-$ar[2] = 3;
-
-var_dump($ar-offsetExists(4));
-?
---EXPECT--
-bool(false)

Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first.phpt	2009-08-31 13:26:14 UTC (rev 287920)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first.phpt	2009-08-31 15:32:39 UTC (rev 287921)
@@ -1,25 +0,0 @@
---TEST--
-SPL: SplDoublyLinkedList : offsetUnset - first element
---CREDITS--
-PHPNW TestFest2009 - Rowan Merewood ro...@merewood.org
---FILE--
-?php
-$list = new SplDoublyLinkedList();
-$list-push('oh');
-$list-push('hai');
-$list-push('thar');
-$list-offsetUnset(0);
-var_dump($list);
-?
---EXPECTF--
-object(SplDoublyLinkedList)#1 (2) {
-  [%u|b%flags:%u|b%SplDoublyLinkedList:private]=
-  int(0)
-  [%u|b%dllist:%u|b%SplDoublyLinkedList:private]=
-  array(2) {
-[0]=
-%string|unicode%(3) hai
-[1]=
-%string|unicode%(4) thar
-  }
-}

Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first002.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first002.phpt	2009-08-31 13:26:14 UTC (rev 287920)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_first002.phpt	2009-08-31 15:32:39 UTC (rev 287921)
@@ -1,17 +0,0 @@
---TEST--
-SPL: SplDoublyLinkedList : offsetUnset - first element
---CREDITS--
-PHPNW TestFest2009 - Rowan Merewood ro...@merewood.org
---FILE--
-?php
-$list = new SplDoublyLinkedList();
-$list-push('oh');
-$list-push('hai');
-$list-push('thar');
-echo $list-bottom() . \n;
-$list-offsetUnset(0);
-echo $list-bottom() . \n;
-?
---EXPECT--
-oh
-hai

Deleted: php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_last.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_last.phpt	2009-08-31 13:26:14 UTC (rev 287920)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/spldoublylinkedlist_offsetunset_last.phpt	2009-08-31 15:32:39 UTC (rev 287921)
@@ -1,25 +0,0 @@
---TEST--
-SPL: SplDoublyLinkedList : offsetUnset - last element
---CREDITS--
-PHPNW TestFest2009 - Rowan Merewood ro...@merewood.org
---FILE--
-?php
-$list = new SplDoublyLinkedList();
-$list-push('oh');
-$list-push('hai');

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/zlib/tests/zlib_filter_deflate2.phpt branches/PHP_5_2/ext/zlib/zlib_filter.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/tes

2009-08-31 Thread Jani Taskinen 
jani Mon, 31 Aug 2009 21:18:55 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287926

Log:
- Fixed zlib.deflate compress filter to actually accpet level parameter.

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
A   php/php-src/branches/PHP_5_2/ext/zlib/tests/zlib_filter_deflate2.phpt
U   php/php-src/branches/PHP_5_2/ext/zlib/zlib_filter.c
U   php/php-src/branches/PHP_5_3/NEWS
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_filter_deflate2.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_filter.c
A   php/php-src/trunk/ext/zlib/tests/zlib_filter_deflate2.phpt
U   php/php-src/trunk/ext/zlib/zlib_filter.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2009-08-31 19:22:29 UTC (rev 287925)
+++ php/php-src/branches/PHP_5_2/NEWS	2009-08-31 21:18:55 UTC (rev 287926)
@@ -3,6 +3,7 @@
 ?? ??? 2009, PHP 5.2.11
 - Added missing sanity checks around exif processing (Ilia)

+- Fixed zlib.deflate compress filter to actually accpet level parameter. (Jani)
 - Fixed leak on error in popen/exec (and related functions on Windows. (Pierre)

 - Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).

Added: php/php-src/branches/PHP_5_2/ext/zlib/tests/zlib_filter_deflate2.phpt
===
--- php/php-src/branches/PHP_5_2/ext/zlib/tests/zlib_filter_deflate2.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/zlib/tests/zlib_filter_deflate2.phpt	2009-08-31 21:18:55 UTC (rev 287926)
@@ -0,0 +1,16 @@
+--TEST--
+zlib.deflate (with level parameter set)
+--SKIPIF--
+?php if (!extension_loaded(zlib)) print skip; ?
+--FILE--
+?php
+$text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
+
+$fp = fopen('php://stdout', 'w');
+stream_filter_append($fp, 'zlib.deflate', STREAM_FILTER_WRITE, array('level' = 9));
+fwrite($fp, $text);
+fclose($fp);
+
+?
+--EXPECT--
+ËA€ DÑ«Ì΍ñ£†1´MBâíUvñ_‚(ÆELÆõÌ/•aP¹=Pié;Ò6‰fÅCe4·U9;wˆ5ý±m/

Modified: php/php-src/branches/PHP_5_2/ext/zlib/zlib_filter.c
===
--- php/php-src/branches/PHP_5_2/ext/zlib/zlib_filter.c	2009-08-31 19:22:29 UTC (rev 287925)
+++ php/php-src/branches/PHP_5_2/ext/zlib/zlib_filter.c	2009-08-31 21:18:55 UTC (rev 287926)
@@ -353,7 +353,7 @@


 		if (filterparams) {
-			zval **tmpzval;
+			zval **tmpzval, tmp;

 			/* filterparams can either be a scalar value to indicate compression level (shortcut method)
Or can be a hash containing one or more of 'window', 'memory', and/or 'level' members. */
@@ -362,8 +362,6 @@
 case IS_ARRAY:
 case IS_OBJECT:
 	if (zend_hash_find(HASH_OF(filterparams), memory, sizeof(memory), (void**) tmpzval) == SUCCESS) {
-		zval tmp;
-
 		tmp = **tmpzval;
 		zval_copy_ctor(tmp);
 		convert_to_long(tmp);
@@ -377,8 +375,6 @@
 	}

 	if (zend_hash_find(HASH_OF(filterparams), window, sizeof(window), (void**) tmpzval) == SUCCESS) {
-		zval tmp;
-
 		tmp = **tmpzval;
 		zval_copy_ctor(tmp);
 		convert_to_long(tmp);
@@ -392,6 +388,8 @@
 	}

 	if (zend_hash_find(HASH_OF(filterparams), level, sizeof(level), (void**) tmpzval) == SUCCESS) {
+		tmp = **tmpzval;
+
 		/* Psuedo pass through to catch level validating code */
 		goto factory_setlevel;
 	}
@@ -399,19 +397,16 @@
 case IS_STRING:
 case IS_DOUBLE:
 case IS_LONG:
-	{
-		zval tmp;
-
-		tmp = *filterparams;
-		zval_copy_ctor(tmp);
-		convert_to_long(tmp);
+	tmp = *filterparams;
 factory_setlevel:
-		/* Set compression level within reason (-1 == default, 0 == none, 1-9 == least to most compression */
-		if (Z_LVAL(tmp)  -1 || Z_LVAL(tmp)  9) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid compression level specified. (%ld), Z_LVAL(tmp));
-		} else {
-			level = Z_LVAL(tmp);
-		}
+	zval_copy_ctor(tmp);
+	convert_to_long(tmp);
+
+	/* Set compression level within reason (-1 == default, 0 == none, 1-9 == least to most compression */
+	if (Z_LVAL(tmp)  -1 || Z_LVAL(tmp)  9) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid compression level specified. (%ld), Z_LVAL(tmp));
+	} else {
+		level = Z_LVAL(tmp);
 	}
 	break;
 default:

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-08-31 19:22:29 UTC (rev 287925)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-08-31 21:18:55 UTC (rev 287926)
@@ -16,6 +16,7 @@
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
   API. (Scott)

+- Fixed zlib.deflate compress filter to actually accpet level parameter. (Jani)
 - Fixed leak on error

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

2009-08-31 Thread Jani Taskinen 
jani Mon, 31 Aug 2009 21:19:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287927

Log:
fix typo

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-08-31 21:18:55 UTC (rev 287926)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-08-31 21:19:29 UTC (rev 287927)
@@ -3,7 +3,7 @@
 ?? ??? 2009, PHP 5.2.11
 - Added missing sanity checks around exif processing (Ilia)

-- Fixed zlib.deflate compress filter to actually accpet level parameter. (Jani)
+- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
 - Fixed leak on error in popen/exec (and related functions on Windows. (Pierre)

 - Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-31 21:18:55 UTC (rev 287926)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-31 21:19:29 UTC (rev 287927)
@@ -16,7 +16,7 @@
 - Improved shared extension loading on OSX to use the standard Unix dlopen()
   API. (Scott)

-- Fixed zlib.deflate compress filter to actually accpet level parameter. (Jani)
+- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
 - Fixed leak on error in popen/exec (and related functions) on Windows.
   (Pierre)
 - Fixed possible bad caching of symlinked directories in the realpath cache

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/bcmath/tests/bcdiv_error1.phpt branches/PHP_5_2/ext/bcmath/tests/bcdiv_error2.phpt branches/PHP_5_2/ext/bcmath/tests/bcmod_error1.phpt branches/PHP_5_

2009-08-31 Thread Zoe Slattery 
zoe  Mon, 31 Aug 2009 19:22:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287925

Log:
add missing skipifs

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error1.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error2.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcmod_error1.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error1.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error2.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error3.phpt
U   php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcsqrt_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcdiv_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcdiv_error2.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcmod_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcpowmod_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcpowmod_error2.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcpowmod_error3.phpt
U   php/php-src/branches/PHP_5_3/ext/bcmath/tests/bcsqrt_error1.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcdiv_error1.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcdiv_error2.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcmod_error1.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcpowmod_error1.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcpowmod_error2.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcpowmod_error3.phpt
U   php/php-src/trunk/ext/bcmath/tests/bcsqrt_error1.phpt

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error1.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error1.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error1.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -4,6 +4,8 @@
 TestFest2009
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcdiv('10.99', '0');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error2.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error2.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcdiv_error2.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -3,6 +3,8 @@
 --CREDITS--
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcdiv('1', '2', '3', '4');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcmod_error1.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcmod_error1.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcmod_error1.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -3,6 +3,8 @@
 --CREDITS--
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcmod('1', '2', '3');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error1.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error1.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error1.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -3,6 +3,8 @@
 --CREDITS--
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcpowmod('1');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error2.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error2.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error2.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -3,6 +3,8 @@
 --CREDITS--
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcpowmod('1', '2');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error3.phpt
===
--- php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error3.phpt	2009-08-31 18:12:47 UTC (rev 287924)
+++ php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcpowmod_error3.phpt	2009-08-31 19:22:29 UTC (rev 287925)
@@ -3,6 +3,8 @@
 --CREDITS--
 Antoni Torrents
 ant...@solucionsinternet.com
+--SKIPIF--
+?php if(!extension_loaded(bcmath)) print skip; ?
 --FILE--
 ?php
 echo bcpowmod('1', '2', '3', '4', '5');

Modified: php/php-src/branches/PHP_5_2/ext/bcmath/tests/bcsqrt_error1.phpt