date:20101106

[PHP-CVS] svn: /php/php-src/trunk/ NEWS main/SAPI.c main/SAPI.h main/php_variables.c sapi/apache/mod_php5.c sapi/apache2filter/sapi_apache2.c sapi/apache2handler/sapi_apache2.c sapi/nsapi/nsapi.c

2010-11-06 Thread Ilia Alshanetsky

iliaaSat, 06 Nov 2010 17:14:21 +

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

Log:
Updated _SERVER['REQUEST_TIME'] to include microsecond precision.

Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/main/SAPI.c
U   php/php-src/trunk/main/SAPI.h
U   php/php-src/trunk/main/php_variables.c
U   php/php-src/trunk/sapi/apache/mod_php5.c
U   php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
U   php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
U   php/php-src/trunk/sapi/nsapi/nsapi.c

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2010-11-06 16:24:58 UTC (rev 305128)
+++ php/php-src/trunk/NEWS  2010-11-06 17:14:21 UTC (rev 305129)
@@ -4,6 +4,7 @@
 - Upgraded bundled sqlite to version 3.7.3. (Ilia)
 - Upgraded bundled PCRE to version 8.10. (Ilia)

+- Updated _SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
 - Added apache compatible functions (apache_child_terminate, getallheaders,
   apache_request_headers, apache_response_headers) to FastCGI SAPI (Dmitry)
 - Added caches to eliminate repeatable run-time bindings of functions, classes,

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2010-11-06 16:24:58 UTC (rev 305128)
+++ php/php-src/trunk/main/SAPI.c   2010-11-06 17:14:21 UTC (rev 305129)
@@ -961,14 +961,19 @@
}
 }

-SAPI_API time_t sapi_get_request_time(TSRMLS_D)
+SAPI_API double sapi_get_request_time(TSRMLS_D)
 {
if(SG(global_request_time)) return SG(global_request_time);

if (sapi_module.get_request_time  SG(server_context)) {
SG(global_request_time) = 
sapi_module.get_request_time(TSRMLS_C);
} else {
-   SG(global_request_time) = time(0);
+   struct timeval tp = {0};
+   if (!gettimeofday(tp, NULL)) {
+   SG(global_request_time) = (double)(tp.tv_sec + 
tp.tv_usec / 100.00);
+   } else {
+   SG(global_request_time) = (double)time(0);
+   }
}
return SG(global_request_time);
 }

Modified: php/php-src/trunk/main/SAPI.h
===
--- php/php-src/trunk/main/SAPI.h   2010-11-06 16:24:58 UTC (rev 305128)
+++ php/php-src/trunk/main/SAPI.h   2010-11-06 17:14:21 UTC (rev 305129)
@@ -129,7 +129,7 @@
long post_max_size;
int options;
zend_bool sapi_started;
-   time_t global_request_time;
+   double global_request_time;
HashTable known_post_content_types;
 } sapi_globals_struct;

@@ -208,7 +208,7 @@

 SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
 SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
-SAPI_API time_t sapi_get_request_time(TSRMLS_D);
+SAPI_API double sapi_get_request_time(TSRMLS_D);
 SAPI_API void sapi_terminate_process(TSRMLS_D);
 END_EXTERN_C()


Modified: php/php-src/trunk/main/php_variables.c
===
--- php/php-src/trunk/main/php_variables.c  2010-11-06 16:24:58 UTC (rev 
305128)
+++ php/php-src/trunk/main/php_variables.c  2010-11-06 17:14:21 UTC (rev 
305129)
@@ -590,8 +590,8 @@
/* store request init time */
{
zval new_entry;
-   Z_TYPE(new_entry) = IS_LONG;
-   Z_LVAL(new_entry) = sapi_get_request_time(TSRMLS_C);
+   Z_TYPE(new_entry) = IS_DOUBLE;
+   Z_DVAL(new_entry) = sapi_get_request_time(TSRMLS_C);
php_register_variable_ex(REQUEST_TIME, new_entry, array_ptr 
TSRMLS_CC);
}


Modified: php/php-src/trunk/sapi/apache/mod_php5.c
===
--- php/php-src/trunk/sapi/apache/mod_php5.c2010-11-06 16:24:58 UTC (rev 
305128)
+++ php/php-src/trunk/sapi/apache/mod_php5.c2010-11-06 17:14:21 UTC (rev 
305129)
@@ -438,9 +438,9 @@

 /* {{{ php_apache_get_request_time
  */
-static time_t php_apache_get_request_time(TSRMLS_D)
+static double php_apache_get_request_time(TSRMLS_D)
 {
-   return ((request_rec *)SG(server_context))-request_time;
+   return (double) ((request_rec *)SG(server_context))-request_time;
 }
 /* }}} */


Modified: php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
===
--- php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-11-06 16:24:58 UTC 
(rev 305128)
+++ php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-11-06 17:14:21 UTC 
(rev 305129)
@@ -308,10 +308,10 @@
return OK;
 }

-static time_t php_apache_sapi_get_request_time(TSRMLS_D)
+static double php_apache_sapi_get_request_time(TSRMLS_D)
 {
php_struct *ctx = SG(server_context);
-   return

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pgsql/pgsql.c branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt trunk/ext/pgsql/pgsql.c trunk/ext/pgsql/tests/bug47199.phpt

2010-11-06 Thread Felipe Pena

felipe   Sat, 06 Nov 2010 17:43:25 +

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

Log:
- Fixed bug #47199 (pg_delete() fails on NULL)
  patch by: ewgraf at gmail dot com

Bug: http://bugs.php.net/47199 (Open) pg_delete fails on NULL
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
A   php/php-src/branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt
U   php/php-src/trunk/ext/pgsql/pgsql.c
A   php/php-src/trunk/ext/pgsql/tests/bug47199.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2010-11-06 17:14:21 UTC (rev 305129)
+++ php/php-src/branches/PHP_5_3/NEWS	2010-11-06 17:43:25 UTC (rev 305130)
@@ -179,6 +179,7 @@
   Pierre)
 - Fixed bug #47643 (array_diff() takes over 3000 times longer than php 5.2.4).
   (Felipe)
+- Fixed bug #47199 (pg_delete() fails on NULL). (ewgraf at gmail dot com)
 - Fixed bug #45921 (Can't initialize character set hebrew). (Andrey)
 - Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy
   with SoapClient object). (Dmitry)

Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c	2010-11-06 17:14:21 UTC (rev 305129)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c	2010-11-06 17:43:25 UTC (rev 305130)
@@ -5930,7 +5930,7 @@
 }
 /* }}} */

-static inline int build_assignment_string(smart_str *querystr, HashTable *ht, const char *pad, int pad_len TSRMLS_DC)
+static inline int build_assignment_string(smart_str *querystr, HashTable *ht, int where_cond, const char *pad, int pad_len TSRMLS_DC)
 {
 	HashPosition pos;
 	uint fld_len;
@@ -5949,7 +5949,11 @@
 			return -1;
 		}
 		smart_str_appendl(querystr, fld, fld_len - 1);
-		smart_str_appendc(querystr, '=');
+		if (where_cond  Z_TYPE_PP(val) == IS_STRING  !strcmp(Z_STRVAL_PP(val), NULL)) {
+			smart_str_appends(querystr,  IS );
+		} else {
+			smart_str_appendc(querystr, '=');
+		}

 		switch(Z_TYPE_PP(val)) {
 			case IS_STRING:
@@ -6011,12 +6015,12 @@
 	smart_str_appends(querystr, table);
 	smart_str_appends(querystr,  SET );

-	if (build_assignment_string(querystr, Z_ARRVAL_P(var_array), ,, 1 TSRMLS_CC))
+	if (build_assignment_string(querystr, Z_ARRVAL_P(var_array), 0, ,, 1 TSRMLS_CC))
 		goto cleanup;

 	smart_str_appends(querystr,  WHERE );

-	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array),  AND , sizeof( AND )-1 TSRMLS_CC))
+	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array), 1,  AND , sizeof( AND )-1 TSRMLS_CC))
 		goto cleanup;

 	smart_str_appendc(querystr, ';');
@@ -6112,7 +6116,7 @@
 	smart_str_appends(querystr, table);
 	smart_str_appends(querystr,  WHERE );

-	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array),  AND , sizeof( AND )-1 TSRMLS_CC))
+	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array), 1,  AND , sizeof( AND )-1 TSRMLS_CC))
 		goto cleanup;

 	smart_str_appendc(querystr, ';');
@@ -6251,7 +6255,7 @@
 	smart_str_appends(querystr, table);
 	smart_str_appends(querystr,  WHERE );

-	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array),  AND , sizeof( AND )-1 TSRMLS_CC))
+	if (build_assignment_string(querystr, Z_ARRVAL_P(ids_array), 1,  AND , sizeof( AND )-1 TSRMLS_CC))
 		goto cleanup;

 	smart_str_appendc(querystr, ';');

Added: php/php-src/branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt	2010-11-06 17:43:25 UTC (rev 305130)
@@ -0,0 +1,67 @@
+--TEST--
+Bug #47199 (pg_delete fails on NULL)
+--SKIPIF--
+?php
+require_once('skipif.inc');
+?
+--FILE--
+?php
+
+require_once('config.inc');
+
+$dbh = pg_connect($conn_str);
+$tbl_name = 'test_47199';
+...@pg_query(DROP TABLE $tbl_name);
+pg_query(CREATE TABLE $tbl_name (null_field INT, not_null_field INT NOT NULL));
+
+pg_insert($dbh, $tbl_name, array('null_field' = null, 'not_null_field' = 1));
+pg_insert($dbh, $tbl_name, array('null_field' = null, 'not_null_field' = 2));
+
+var_dump(pg_fetch_all(pg_query('SELECT * FROM '. $tbl_name)));
+
+$query = pg_delete($dbh, $tbl_name, array('null_field' = NULL,'not_null_field' = 2), PGSQL_DML_STRING|PGSQL_DML_EXEC);
+
+echo $query, \n;
+
+$query = pg_update($dbh, $tbl_name, array('null_field' = NULL, 'not_null_field' = 0), array('not_null_field' = 1, 'null_field' = ''), PGSQL_DML_STRING|PGSQL_DML_EXEC);
+
+echo $query, \n;
+
+var_dump(pg_fetch_all(pg_query('SELECT * FROM '. $tbl_name)));
+
+...@pg_query(DROP TABLE $tbl_name);
+pg_close($dbh);
+
+echo PHP_EOL.Done.PHP_EOL;
+
+?
+--EXPECTF--
+array(2) {
+  [0]=
+  array(2) {
+[null_field]=
+NULL
+[not_null_field]=
+string(1) 1
+

Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS main/SAPI.c main/SAPI.h main/php_variables.c sapi/apache/mod_php5.c sapi/apache2filter/sapi_apache2.c sapi/apache2handler/sapi_apache2.c sapi/nsapi/nsapi.c

2010-11-06 Thread Pierre Joye

hi Ilia,

Please add a note to the UPGRADING file.

Thanks!

On Sat, Nov 6, 2010 at 6:14 PM, Ilia Alshanetsky il...@php.net wrote:
 iliaa                                    Sat, 06 Nov 2010 17:14:21 +

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

 Log:
 Updated _SERVER['REQUEST_TIME'] to include microsecond precision.

 Changed paths:
    U   php/php-src/trunk/NEWS
    U   php/php-src/trunk/main/SAPI.c
    U   php/php-src/trunk/main/SAPI.h
    U   php/php-src/trunk/main/php_variables.c
    U   php/php-src/trunk/sapi/apache/mod_php5.c
    U   php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
    U   php/php-src/trunk/sapi/apache2handler/sapi_apache2.c
    U   php/php-src/trunk/sapi/nsapi/nsapi.c

 Modified: php/php-src/trunk/NEWS
 ===
 --- php/php-src/trunk/NEWS      2010-11-06 16:24:58 UTC (rev 305128)
 +++ php/php-src/trunk/NEWS      2010-11-06 17:14:21 UTC (rev 305129)
 @@ -4,6 +4,7 @@
  - Upgraded bundled sqlite to version 3.7.3. (Ilia)
  - Upgraded bundled PCRE to version 8.10. (Ilia)

 +- Updated _SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
  - Added apache compatible functions (apache_child_terminate, getallheaders,
   apache_request_headers, apache_response_headers) to FastCGI SAPI (Dmitry)
  - Added caches to eliminate repeatable run-time bindings of functions, 
 classes,

 Modified: php/php-src/trunk/main/SAPI.c
 ===
 --- php/php-src/trunk/main/SAPI.c       2010-11-06 16:24:58 UTC (rev 305128)
 +++ php/php-src/trunk/main/SAPI.c       2010-11-06 17:14:21 UTC (rev 305129)
 @@ -961,14 +961,19 @@
        }
  }

 -SAPI_API time_t sapi_get_request_time(TSRMLS_D)
 +SAPI_API double sapi_get_request_time(TSRMLS_D)
  {
        if(SG(global_request_time)) return SG(global_request_time);

        if (sapi_module.get_request_time  SG(server_context)) {
                SG(global_request_time) = 
 sapi_module.get_request_time(TSRMLS_C);
        } else {
 -               SG(global_request_time) = time(0);
 +               struct timeval tp = {0};
 +               if (!gettimeofday(tp, NULL)) {
 +                       SG(global_request_time) = (double)(tp.tv_sec + 
 tp.tv_usec / 100.00);
 +               } else {
 +                       SG(global_request_time) = (double)time(0);
 +               }
        }
        return SG(global_request_time);
  }

 Modified: php/php-src/trunk/main/SAPI.h
 ===
 --- php/php-src/trunk/main/SAPI.h       2010-11-06 16:24:58 UTC (rev 305128)
 +++ php/php-src/trunk/main/SAPI.h       2010-11-06 17:14:21 UTC (rev 305129)
 @@ -129,7 +129,7 @@
        long post_max_size;
        int options;
        zend_bool sapi_started;
 -       time_t global_request_time;
 +       double global_request_time;
        HashTable known_post_content_types;
  } sapi_globals_struct;

 @@ -208,7 +208,7 @@

  SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
  SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
 -SAPI_API time_t sapi_get_request_time(TSRMLS_D);
 +SAPI_API double sapi_get_request_time(TSRMLS_D);
  SAPI_API void sapi_terminate_process(TSRMLS_D);
  END_EXTERN_C()


 Modified: php/php-src/trunk/main/php_variables.c
 ===
 --- php/php-src/trunk/main/php_variables.c      2010-11-06 16:24:58 UTC (rev 
 305128)
 +++ php/php-src/trunk/main/php_variables.c      2010-11-06 17:14:21 UTC (rev 
 305129)
 @@ -590,8 +590,8 @@
        /* store request init time */
        {
                zval new_entry;
 -               Z_TYPE(new_entry) = IS_LONG;
 -               Z_LVAL(new_entry) = sapi_get_request_time(TSRMLS_C);
 +               Z_TYPE(new_entry) = IS_DOUBLE;
 +               Z_DVAL(new_entry) = sapi_get_request_time(TSRMLS_C);
                php_register_variable_ex(REQUEST_TIME, new_entry, array_ptr 
 TSRMLS_CC);
        }


 Modified: php/php-src/trunk/sapi/apache/mod_php5.c
 ===
 --- php/php-src/trunk/sapi/apache/mod_php5.c    2010-11-06 16:24:58 UTC (rev 
 305128)
 +++ php/php-src/trunk/sapi/apache/mod_php5.c    2010-11-06 17:14:21 UTC (rev 
 305129)
 @@ -438,9 +438,9 @@

  /* {{{ php_apache_get_request_time
  */
 -static time_t php_apache_get_request_time(TSRMLS_D)
 +static double php_apache_get_request_time(TSRMLS_D)
  {
 -       return ((request_rec *)SG(server_context))-request_time;
 +       return (double) ((request_rec *)SG(server_context))-request_time;
  }
  /* }}} */


 Modified: php/php-src/trunk/sapi/apache2filter/sapi_apache2.c
 ===
 --- php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-11-06 16:24:58 
 UTC (rev 305128)
 +++ php/php-src/trunk/sapi/apache2filter/sapi_apache2.c 2010-11-06 17:14:21 
 UTC (rev 305129)
 @@ -308,10 +308,10 @@

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pcre/php_pcre.c branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt branches/PHP_5_3/ext/pcre/tests/bug52732.phpt branches/PHP_

2010-11-06 Thread Felipe Pena

felipe   Sat, 06 Nov 2010 18:32:10 +

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

Log:
- Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it 
returns int(0))
  patch by: slugonamission at gmail dot com

Bug: http://bugs.php.net/52732 (Open) Docs say preg_match() returns FALSE on 
error, but it returns int(0)
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
U   php/php-src/branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt
A   php/php-src/branches/PHP_5_3/ext/pcre/tests/bug52732.phpt
U   php/php-src/branches/PHP_5_3/ext/pcre/tests/invalid_utf8_offset.phpt
U   php/php-src/branches/PHP_5_3/ext/pcre/tests/recursion_limit.phpt
U   php/php-src/trunk/ext/pcre/php_pcre.c
U   php/php-src/trunk/ext/pcre/tests/backtrack_limit.phpt
A   php/php-src/trunk/ext/pcre/tests/bug52732.phpt
U   php/php-src/trunk/ext/pcre/tests/invalid_utf8_offset.phpt
U   php/php-src/trunk/ext/pcre/tests/recursion_limit.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-11-06 18:24:47 UTC (rev 305131)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-11-06 18:32:10 UTC (rev 305132)
@@ -106,6 +106,8 @@
   get_class_name before calling it). (Kalle, Gustavo)
 - Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE).
   (gpap at internet dot gr, Adam)
+- Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it
+  returns int(0)). (slugonamission at gmail dot com)
 - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they
   were not available). (fat)
 - Fixed bug #52745 (Binding params doesn't work when selecting a date inside a

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:24:47 UTC 
(rev 305131)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:32:10 UTC 
(rev 305132)
@@ -754,7 +754,13 @@
efree(offsets);
efree(subpat_names);

-   RETVAL_LONG(matched);
+   /* Did we encounter an error? */
+   if(PCRE_G(error_code) == PHP_PCRE_NO_ERROR) {
+   RETVAL_LONG(matched);
+   }
+   else {
+   RETVAL_FALSE;
+   }
 }
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt
2010-11-06 18:24:47 UTC (rev 305131)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt
2010-11-06 18:32:10 UTC (rev 305132)
@@ -19,7 +19,7 @@

 ?
 --EXPECT--
-int(0)
+bool(false)
 bool(true)
 int(10)
 bool(true)

Added: php/php-src/branches/PHP_5_3/ext/pcre/tests/bug52732.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/bug52732.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/bug52732.phpt   2010-11-06 
18:32:10 UTC (rev 305132)
@@ -0,0 +1,13 @@
+--TEST--
+Bug #52732 (Docs say preg_match() returns FALSE on error, but it returns 
int(0))
+--INI--
+pcre.backtrack_limit=1
+--FILE--
+?php
+$ret = preg_match('/(?:\D+|\d+)*[!?]/', 'foobar foobar foobar');
+
+var_dump($ret);
+
+?
+--EXPECT--
+bool(false)
\ No newline at end of file


Property changes on: php/php-src/branches/PHP_5_3/ext/pcre/tests/bug52732.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/invalid_utf8_offset.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/invalid_utf8_offset.phpt
2010-11-06 18:24:47 UTC (rev 305131)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/invalid_utf8_offset.phpt
2010-11-06 18:32:10 UTC (rev 305132)
@@ -22,7 +22,7 @@
 echo Done\n;
 ?
 --EXPECT--
-int(0)
+bool(false)
 array(0) {
 }
 bool(true)

Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/recursion_limit.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/recursion_limit.phpt
2010-11-06 18:24:47 UTC (rev 305131)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/recursion_limit.phpt
2010-11-06 18:32:10 UTC (rev 305132)
@@ -19,7 +19,7 @@

 ?
 --EXPECT--
-int(0)
+bool(false)
 bool(true)
 int(1)
 bool(true)

Modified: php/php-src/trunk/ext/pcre/php_pcre.c
===
--- php/php-src/trunk/ext/pcre/php_pcre.c   2010-11-06 18:24:47 UTC (rev 
305131)
+++ php/php-src/trunk/ext/pcre/php_pcre.c   2010-11-06 18:32:10

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c

2010-11-06 Thread Felipe Pena

felipe   Sat, 06 Nov 2010 18:35:38 +

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

Log:
- Coding standards

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
U   php/php-src/trunk/ext/pcre/php_pcre.c

Modified: php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c
===
--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:32:10 UTC 
(rev 305132)
+++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c2010-11-06 18:35:38 UTC 
(rev 305133)
@@ -755,10 +755,9 @@
efree(subpat_names);

/* Did we encounter an error? */
-   if(PCRE_G(error_code) == PHP_PCRE_NO_ERROR) {
+   if (PCRE_G(error_code) == PHP_PCRE_NO_ERROR) {
RETVAL_LONG(matched);
-   }
-   else {
+   } else {
RETVAL_FALSE;
}
 }

Modified: php/php-src/trunk/ext/pcre/php_pcre.c
===
--- php/php-src/trunk/ext/pcre/php_pcre.c   2010-11-06 18:32:10 UTC (rev 
305132)
+++ php/php-src/trunk/ext/pcre/php_pcre.c   2010-11-06 18:35:38 UTC (rev 
305133)
@@ -755,10 +755,9 @@
efree(subpat_names);

/* Did we encounter an error? */
-   if(PCRE_G(error_code) == PHP_PCRE_NO_ERROR) {
+   if (PCRE_G(error_code) == PHP_PCRE_NO_ERROR) {
RETVAL_LONG(matched);
-   }
-   else {
+   } else {
RETVAL_FALSE;
}
 }

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS main/SAPI.c main/SAPI.h main/php_variables.c sapi/apache/mod_php5.c sapi/apache2filter/sapi_apache2.c sapi/apache2handler/sapi_apache2.c sapi/nsapi/nsapi.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pgsql/pgsql.c branches/PHP_5_3/ext/pgsql/tests/bug47199.phpt trunk/ext/pgsql/pgsql.c trunk/ext/pgsql/tests/bug47199.phpt

Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS main/SAPI.c main/SAPI.h main/php_variables.c sapi/apache/mod_php5.c sapi/apache2filter/sapi_apache2.c sapi/apache2handler/sapi_apache2.c sapi/nsapi/nsapi.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pcre/php_pcre.c branches/PHP_5_3/ext/pcre/tests/backtrack_limit.phpt branches/PHP_5_3/ext/pcre/tests/bug52732.phpt branches/PHP_

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcre/php_pcre.c trunk/ext/pcre/php_pcre.c

5 matches

Site Navigation

Mail list logo

Footer information