[PHP-CVS] com php-src: versions no longer supported, no need to check: main/win32_internal_function_disabled.h

2013-03-27 Thread Pierre Joye 
Commit:d0aa831614aafc2ae4975a0dc1e92ab97651d818
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 07:15:23 
+0100
Parents:   f3ebb40ad6041e9c29e165f9d7017fb50063129f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=d0aa831614aafc2ae4975a0dc1e92ab97651d818

Log:
versions no longer supported, no need to check

Changed paths:
  M  main/win32_internal_function_disabled.h


Diff:
diff --git a/main/win32_internal_function_disabled.h 
b/main/win32_internal_function_disabled.h
index 3a78f6c..80fd8d1 100644
--- a/main/win32_internal_function_disabled.h
+++ b/main/win32_internal_function_disabled.h
@@ -23,12 +23,14 @@
 /*
 Windows Server 2008 6.0
 Windows Vista   6.0
+
+Verssions below are not supported anymore, php won't even load:
 Windows Server 2003 R2  5.2
 Windows Server 2003 5.2
 Windows XP  5.1
 Windows 20005.0
 */
-static const char *function_name_5[] = {link, NULL};
-const int function_name_cnt_5 = 1;
+static const char *function_name_5[] = {NULL};
+const int function_name_cnt_5 = 0;
 static const char *function_name_6[] = {readlink, symlink, NULL};
 const int function_name_cnt_6 = 2;


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

[PHP-CVS] com php-src: add windows 8 and windows server 2012: ext/standard/info.c

2013-03-27 Thread Pierre Joye 
Commit:f01a7e54d3d3ab82e7739b1e43a21179297208f6
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 07:29:47 
+0100
Parents:   d0aa831614aafc2ae4975a0dc1e92ab97651d818
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f01a7e54d3d3ab82e7739b1e43a21179297208f6

Log:
add windows 8 and windows server 2012

Changed paths:
  M  ext/standard/info.c


Diff:
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 20e6b0c..e8ba908 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -316,7 +316,7 @@ char* php_get_windows_name()
}
 
if (VER_PLATFORM_WIN32_NT==osvi.dwPlatformId  osvi.dwMajorVersion  4 
) {
-   if (osvi.dwMajorVersion == 6)   {
+   if (osvi.dwMajorVersion == 6) {
if( osvi.dwMinorVersion == 0 ) {
if( osvi.wProductType == VER_NT_WORKSTATION ) {
major = Windows Vista;
@@ -330,6 +330,12 @@ char* php_get_windows_name()
} else {
major = Windows Server 2008 R2;
}
+   } else if ( osvi.dwMinorVersion == 2 ) {
+   if( osvi.wProductType == VER_NT_WORKSTATION )  {
+   major = Windows 8;
+   } else {
+   major = Windows Server 2012;
+   }
} else {
major = Unknown Windows version;
}


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c

2013-03-27 Thread Pierre Joye 
Commit:33e834aab88277b1e4597c42878a2eebb428f3ef
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 17:39:05 
+0100
Parents:   b03810761eccd582f2c500c997424b646909d474 
e7d88a63fa19c4b3df544563416b2c4370ad194b
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=33e834aab88277b1e4597c42878a2eebb428f3ef

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  add WebP support in phpinfo

Changed paths:
  MM  ext/gd/gd.c


Diff:



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

[PHP-CVS] com php-src: add WebP support in phpinfo: ext/gd/gd.c

2013-03-27 Thread Pierre Joye 
Commit:e7d88a63fa19c4b3df544563416b2c4370ad194b
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 17:38:57 
+0100
Parents:   f01a7e54d3d3ab82e7739b1e43a21179297208f6
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e7d88a63fa19c4b3df544563416b2c4370ad194b

Log:
add WebP support in phpinfo

Changed paths:
  M  ext/gd/gd.c


Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 3ce1a2c..d929e7f 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1439,6 +1439,9 @@ PHP_MINFO_FUNCTION(gd)
 #if defined(USE_GD_JISX0208)  defined(HAVE_GD_BUNDLED)
php_info_print_table_row(2, JIS-mapped Japanese Font Support, 
enabled);
 #endif
+#ifdef HAVE_GD_WEBP
+   php_info_print_table_row(2, WebP Support, enabled);
+#endif
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
 }


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

[PHP-CVS] com php-src: Added description for opcache.enable_cli: ext/opcache/README

2013-03-27 Thread Dmitry Stogov 
Commit:f1395346942e1022620de821fbc1a020e37222c8
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 21:02:39 
+0400
Parents:   f01a7e54d3d3ab82e7739b1e43a21179297208f6
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f1395346942e1022620de821fbc1a020e37222c8

Log:
Added description for opcache.enable_cli

Changed paths:
  M  ext/opcache/README


Diff:
diff --git a/ext/opcache/README b/ext/opcache/README
index f87e1cc..03386a0 100644
--- a/ext/opcache/README
+++ b/ext/opcache/README
@@ -63,7 +63,11 @@ Configuration Directives
 
 
 opcache.enable (default 1)
-   OPcache On/Off switch. When set to Off, code is not optimized.
+   OPcache On/Off switch. When set to Off, code is not optimized and 
cached.
+
+opcache.enable_cli (default 0)
+   Enables the OPcache for the CLI version of PHP. It's mostly for testing
+   and debugging.
 
 opcache.memory_consumption (default 64)
The OPcache shared memory storage size. The amount of memory for storing


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

[PHP-CVS] com php-src: Added opcache.enable_cli=0: php.ini-development php.ini-production

2013-03-27 Thread Dmitry Stogov 
Commit:26f3ff25fe6d31463c104a034b72fff42b123d5f
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 21:08:18 
+0400
Parents:   f1395346942e1022620de821fbc1a020e37222c8
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=26f3ff25fe6d31463c104a034b72fff42b123d5f

Log:
Added opcache.enable_cli=0

Changed paths:
  M  php.ini-development
  M  php.ini-production


Diff:
diff --git a/php.ini-development b/php.ini-development
index e79a3e0..e9c7cd6 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1864,6 +1864,9 @@ ldap.max_links = -1
 ; Determines if Zend OPCache is enabled
 ;opcache.enable=0
 
+; Determines if Zend OPCache is enabled for the CLI version of PHP
+;opcache.enable_cli=0
+
 ; The OPcache shared memory storage size.
 ;opcache.memory_consumption=64
 
diff --git a/php.ini-production b/php.ini-production
index 33fcd3a..600debc 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1864,6 +1864,9 @@ ldap.max_links = -1
 ; Determines if Zend OPCache is enabled
 ;opcache.enable=0
 
+; Determines if Zend OPCache is enabled for the CLI version of PHP
+;opcache.enable_cli=0
+
 ; The OPcache shared memory storage size.
 ;opcache.memory_consumption=64


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production

2013-03-27 Thread Dmitry Stogov 
Commit:e67e6a1f36836a2ecdfc82ffc29763eba5f9d741
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 21:08:58 
+0400
Parents:   d40174c6bb4e118b287c0e782e5570d55d7f1db3 
26f3ff25fe6d31463c104a034b72fff42b123d5f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e67e6a1f36836a2ecdfc82ffc29763eba5f9d741

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.enable_cli=0

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



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

[PHP-CVS] com php-src: Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all): ext/opcache/shared_alloc_win32.c ext/opcache/zend_shared_alloc.c ext/opcache/zend_shared_alloc.h

2013-03-27 Thread Dmitry Stogov 
Commit:91ab11ed078f0fde6d17f278f7f3705c9fb38805
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 22:16:18 
+0400
Parents:   fc7efecda05b85634b87311400842678985c66aa
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=91ab11ed078f0fde6d17f278f7f3705c9fb38805

Log:
Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)

Bugs:
https://bugs.php.net/76

Changed paths:
  M  ext/opcache/shared_alloc_win32.c
  M  ext/opcache/zend_shared_alloc.c
  M  ext/opcache/zend_shared_alloc.h


Diff:
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
index e323952..2c32184 100644
--- a/ext/opcache/shared_alloc_win32.c
+++ b/ext/opcache/shared_alloc_win32.c
@@ -166,7 +166,7 @@ static int zend_shared_alloc_reattach(size_t 
requested_size, char **error_in)
}
return ALLOC_FAIL_MAPPING;
}
-   smm_shared_globals = (zend_smm_shared_globals *) (((char *) 
mapping_base) + sizeof(zend_shared_memory_block_header));
+   smm_shared_globals = (zend_smm_shared_globals *) mapping_base;
 
return SUCCESSFULLY_REATTACHED;
 }
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index f4465ce..18e8bdb 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -284,7 +284,7 @@ static size_t zend_shared_alloc_get_largest_free_block(void)
 void *zend_shared_alloc(size_t size)
 {
int i;
-   unsigned int block_size = size + 
sizeof(zend_shared_memory_block_header);
+   unsigned int block_size = ZEND_ALIGNED_SIZE(size);
TSRMLS_FETCH();
 
 #if 1
@@ -298,19 +298,11 @@ void *zend_shared_alloc(size_t size)
}
for (i = 0; i  ZSMMG(shared_segments_count); i++) {
if (ZSMMG(shared_segments)[i]-size - 
ZSMMG(shared_segments)[i]-pos = block_size) { /* found a valid block */
-   zend_shared_memory_block_header *p = 
(zend_shared_memory_block_header *) (((char *) ZSMMG(shared_segments)[i]-p) + 
ZSMMG(shared_segments)[i]-pos);
-   int remainder = block_size % PLATFORM_ALIGNMENT;
-   void *retval;
+   void *retval = (void *) (((char *) 
ZSMMG(shared_segments)[i]-p) + ZSMMG(shared_segments)[i]-pos);
 
-   if (remainder != 0) {
-   size += PLATFORM_ALIGNMENT - remainder;
-   block_size += PLATFORM_ALIGNMENT - remainder;
-   }
ZSMMG(shared_segments)[i]-pos += block_size;
ZSMMG(shared_free) -= block_size;
-   p-size = size;
-   retval = ((char *) p) + 
sizeof(zend_shared_memory_block_header);
-   memset(retval, 0, size);
+   memset(retval, 0, block_size);
return retval;
}
}
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index 23af630..b7f3629 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -89,10 +89,6 @@ typedef struct _handler_entry {
zend_shared_memory_handlers *handler;
 } zend_shared_memory_handler_entry;
 
-typedef struct _zend_shared_memory_block_header {
-   int size;
-} zend_shared_memory_block_header;
-
 typedef struct _zend_shared_memory_state {
int *positions;   /* current positions for each segment */
int  shared_free; /* amount of free shared memory */


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

[PHP-CVS] tag php-src: create tag php-5.5.0beta2

2013-03-27 Thread David Soria Parra 
Tag php-5.5.0beta2 in php-src.git was created
Tag: 31e91a41af26c3dacb90b48735aa803bddf3fabc
Tagger:  David Soria Parrad...@php.net Wed Mar 27 19:47:10 2013 
+0100
Log:
PHP 5.5.0 Beta 2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.13 (GNU/Linux)

iQIcBAABAgAGBQJRUz6xAAoJEME8cLhyZ7Ut82kP/0jMASBTea6xZUF67+2e1y3m
YcbmqEsw4OV94lVTMoIx3RGNxlqL+d5EawrNtu5X2S1sEFmUDNLRh/VhtOQrQwso
GCvN3OvzeCsdpsYFymNqOA1k6fGsif4mIwF0bBncg88xA0g+IsNWmK/x05s5Z33r
oHp0X3PONWff890Iy38kwrpyP5F4rlDj+Apfju0PJoMI0exSqCIKMT0n7UYK7Z/Q
1wtHKPN/LyExT0Hs63A1AeigQDCNnKNibBEv2onuHAMYcNd9i8X6Vs22Vi7q/zIA
YpPFOCdcCYV4lEkHtfVJSpfJ/MBjZ8R38ZGU1MqlzQ/+up1XjV2wqdu1C3xpPkuh
7wXRoWNB2U42kOmh7ifjkfvD0yeRqARAsZx9RXIKKlZ/Y7nYwtU14p9zKdd6oCqV
hAa9nT5DrUACMdiWUd2jUWXeGV70UKZOTGG1/dro62nKlSHK38zpTld9cw6mSQZQ
49QIGRleAAuT3NAAJQL40EoYCMm2fQkKLH8qo6zRcbw1cK1eG3z50ahjcwn6IpYh
66ScXOD0Ah1SfvlOWnP26cRxHI7LIKb2fIyUCKRWmRShytrTNZsewebpRbwmr8/7
3jpKQG303+5TH9J5t4AEqUl9Hv1AC321xxWWJW/+yKSt+6/pw1M9zrmVjrcRm0ko
GPTkOgBhoy4XGvagOXWI
=UBNC
-END PGP SIGNATURE-

Link: 
http://git.php.net/?p=php-src.git;a=tag;h=31e91a41af26c3dacb90b48735aa803bddf3fabc

Target:  c5ffec0d344836909da4856ab0ef3d834e672312
Author:  David Soria Parra d...@php.net Wed, 27 Mar 2013 19:31:13 
+0100
Parents: 2185746febea5c65187c86a6dc21d5b2034a950f
Target link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=c5ffec0d344836909da4856ab0ef3d834e672312
Target log:
PHP 5.5.0 Beta 2

Changed paths:
  M  configure.in
  M  main/php_version.h



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

[PHP-CVS] com php-src: NEWS Section for beta 3: NEWS

2013-03-27 Thread David Soria Parra 
Commit:ef6cdb85d9d10c3d2de229c54419b50b960e7789
Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 19:57:24 
+0100
Parents:   2185746febea5c65187c86a6dc21d5b2034a950f
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ef6cdb85d9d10c3d2de229c54419b50b960e7789

Log:
NEWS Section for beta 3

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 6a14d15..2a57c34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 PHPNEWS
 |||
+?? ??? 20??, PHP 5.5.0 Beta 3
+
+
 28 Mar 2013, PHP 5.5.0 Beta 2
 
 - Core:


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

[PHP-CVS] com php-src: News for beta 2: NEWS

2013-03-27 Thread David Soria Parra 
Commit:2185746febea5c65187c86a6dc21d5b2034a950f
Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 19:30:43 
+0100
Parents:   91ab11ed078f0fde6d17f278f7f3705c9fb38805
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=2185746febea5c65187c86a6dc21d5b2034a950f

Log:
News for beta 2

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index e33c7a3..6a14d15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 20??, PHP 5.5.0 Beta 2
+28 Mar 2013, PHP 5.5.0 Beta 2
 
 - Core:
   . Fixed bug #64515 (Memoryleak when using the same variablename 2times in


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

[PHP-CVS] com php-src: Remove unused variable: ext/dba/dba.c

2013-03-27 Thread David Soria Parra 
Commit:f92a15864b366484470b7a371d553853a03d9b25
Author:David Soria Parra d...@php.net Wed, 27 Mar 2013 20:00:54 
+0100
Parents:   ef6cdb85d9d10c3d2de229c54419b50b960e7789
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f92a15864b366484470b7a371d553853a03d9b25

Log:
Remove unused variable

Changed paths:
  M  ext/dba/dba.c


Diff:
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 303d65c..5273c05 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -538,7 +538,6 @@ PHP_MINFO_FUNCTION(dba)
  */
 static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
-   char *v;
int val_len;
zval *id;
dba_info *info = NULL;


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

[PHP-CVS] com php-src: Fixed issue #74 (Allowed per request OPcache disabling): ext/opcache/zend_accelerator_module.c

2013-03-27 Thread Dmitry Stogov 
Commit:1556d5df8ad50a175f8bac0aa4366756bd8904de
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 23:13:21 
+0400
Parents:   91ab11ed078f0fde6d17f278f7f3705c9fb38805
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=1556d5df8ad50a175f8bac0aa4366756bd8904de

Log:
Fixed issue #74 (Allowed per request OPcache disabling)

Bugs:
https://bugs.php.net/74

Changed paths:
  M  ext/opcache/zend_accelerator_module.c


Diff:
diff --git a/ext/opcache/zend_accelerator_module.c 
b/ext/opcache/zend_accelerator_module.c
index 0d452ad..8cfab79 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -177,8 +177,37 @@ static ZEND_INI_MH(OnUpdateMaxWastedPercentage)
return SUCCESS;
 }
 
+static ZEND_INI_MH(OnEnable)
+{
+   if (stage == ZEND_INI_STAGE_STARTUP ||
+   stage == ZEND_INI_STAGE_SHUTDOWN ||
+   stage == ZEND_INI_STAGE_DEACTIVATE) {
+   return OnUpdateBool(entry, new_value, new_value_length, 
mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+   } else {
+   /* It may be only temporary disabled */
+   zend_bool *p;
+#ifndef ZTS
+   char *base = (char *) mh_arg2;
+#else
+   char *base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+   p = (zend_bool *) (base+(size_t) mh_arg1);
+   if ((new_value_length == 2  strcasecmp(on, new_value) == 0) 
||
+   (new_value_length == 3  strcasecmp(yes, new_value) == 
0) ||
+   (new_value_length == 4  strcasecmp(true, new_value) == 
0) ||
+   atoi(new_value) != 0) {
+   zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME  can't 
be temporary enabled (it may be only disabled till the end of request));
+   return FAILURE;
+   } else {
+   *p = 0;
+   return SUCCESS;
+   }
+   }
+}
+
 ZEND_INI_BEGIN()
-STD_PHP_INI_BOOLEAN(opcache.enable , 1, PHP_INI_SYSTEM, 
OnUpdateBool, enabled , zend_accel_globals, 
accel_globals)
+STD_PHP_INI_BOOLEAN(opcache.enable , 1, PHP_INI_ALL,
OnEnable, enabled , zend_accel_globals, 
accel_globals)
STD_PHP_INI_BOOLEAN(opcache.use_cwd, 1, PHP_INI_SYSTEM, 
OnUpdateBool, accel_directives.use_cwd, zend_accel_globals, 
accel_globals)
STD_PHP_INI_BOOLEAN(opcache.validate_timestamps, 1, PHP_INI_ALL   , 
OnUpdateBool, accel_directives.validate_timestamps, zend_accel_globals, 
accel_globals)
STD_PHP_INI_BOOLEAN(opcache.inherited_hack , 1, PHP_INI_SYSTEM, 
OnUpdateBool, accel_directives.inherited_hack , zend_accel_globals, 
accel_globals)


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_compile.c Zend/zend_compile.h Zend/zend_execute_API.c Zend/zend_language_scanner.c Zend/zend_language_scanner.l

2013-03-27 Thread Dmitry Stogov 
Commit:6e8aa096964e1d723a9cae3572b2f0affa4e53c0
Author:Dmitry Stogov dmi...@zend.com Thu, 28 Mar 2013 00:08:11 
+0400
Parents:   391a41e16701dc3a92a4af6dc4a7e23c98a0e314 
85e5e60777209c13c71785da31af86a5e0a98d92
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=6e8aa096964e1d723a9cae3572b2f0affa4e53c0

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h

Bugs:
https://bugs.php.net/64529

Changed paths:
  MM  Zend/zend_compile.c
  MM  Zend/zend_compile.h
  MM  Zend/zend_execute_API.c
  MM  Zend/zend_language_scanner.c
  MM  Zend/zend_language_scanner.l


Diff:
diff --cc Zend/zend_execute_API.c
index f099784,09e703c..8739e21
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@@ -1294,9 -1312,9 +1294,9 @@@ void execute_new_code(TSRMLS_D) /* {{{ 
ZEND_VM_SET_OPCODE_HANDLER(opline);
opline++;
}
 -  
 +
-   zend_release_labels(TSRMLS_C);
+   zend_release_labels(1 TSRMLS_CC);
 -  
 +
EG(return_value_ptr_ptr) = NULL;
EG(active_op_array) = CG(active_op_array);
orig_interactive = CG(interactive);


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

[PHP-CVS] com php-src: Fixed bug #64529 (Ran out of opcode space): NEWS Zend/zend_compile.c Zend/zend_compile.h Zend/zend_execute_API.c Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/z

2013-03-27 Thread Dmitry Stogov 
Commit:85e5e60777209c13c71785da31af86a5e0a98d92
Author:Dmitry Stogov dmi...@zend.com Thu, 28 Mar 2013 00:03:40 
+0400
Parents:   1182a3356c6c1989a686aab5258e1d47c56b2955
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=85e5e60777209c13c71785da31af86a5e0a98d92

Log:
Fixed bug #64529 (Ran out of opcode space)

Bugs:
https://bugs.php.net/64529

Changed paths:
  M  NEWS
  M  Zend/zend_compile.c
  M  Zend/zend_compile.h
  M  Zend/zend_execute_API.c
  M  Zend/zend_language_scanner.c
  M  Zend/zend_language_scanner.l
  M  Zend/zend_language_scanner_defs.h


Diff:
diff --git a/NEWS b/NEWS
index 010b8f1..c085d8f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP 
   NEWS
 |||
 ?? ??? 2013, PHP 5.4.14
 - Core
+  . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
   . Fixed bug #64515 (Memoryleak when using the same variablename 2times in
 function declaration). (Laruence)
   . Fixed bug #64432 (more empty delimiter warning in strX methods). (Laruence)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 766a2de..82275ce 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1798,7 +1798,7 @@ void zend_do_end_function_declaration(const znode 
*function_token TSRMLS_DC) /*
zend_do_return(NULL, 0 TSRMLS_CC);
 
pass_two(CG(active_op_array) TSRMLS_CC);
-   zend_release_labels(TSRMLS_C);
+   zend_release_labels(0 TSRMLS_CC);
 
if (CG(active_class_entry)) {
zend_check_magic_method_implementation(CG(active_class_entry), 
(zend_function*)CG(active_op_array), E_COMPILE_ERROR TSRMLS_CC);
@@ -2320,13 +2320,14 @@ void zend_do_goto(const znode *label TSRMLS_DC) /* {{{ 
*/
 }
 /* }}} */
 
-void zend_release_labels(TSRMLS_D) /* {{{ */
+void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */
 {
if (CG(context).labels) {
zend_hash_destroy(CG(context).labels);
FREE_HASHTABLE(CG(context).labels);
+   CG(context).labels = NULL;
}
-   if (!zend_stack_is_empty(CG(context_stack))) {
+   if (!temporary  !zend_stack_is_empty(CG(context_stack))) {
zend_compiler_context *ctx;
 
zend_stack_top(CG(context_stack), (void**)ctx);
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 50ee3a4..32449d2 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -616,7 +616,7 @@ void zend_do_end_compilation(TSRMLS_D);
 void zend_do_label(znode *label TSRMLS_DC);
 void zend_do_goto(const znode *label TSRMLS_DC);
 void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int 
pass2 TSRMLS_DC);
-void zend_release_labels(TSRMLS_D);
+void zend_release_labels(int temporary TSRMLS_DC);
 
 ZEND_API void function_add_ref(zend_function *function);
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a38504f..09e703c 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1313,7 +1313,7 @@ void execute_new_code(TSRMLS_D) /* {{{ */
opline++;
}

-   zend_release_labels(TSRMLS_C);
+   zend_release_labels(1 TSRMLS_CC);

EG(return_value_ptr_ptr) = NULL;
EG(active_op_array) = CG(active_op_array);
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 40fb574..03cf334 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 14 17:46:56 2012 */
+/* Generated by re2c 0.13.5 on Wed Mar 27 23:52:29 2013 */
 #line 1 Zend/zend_language_scanner.l
 /*
+--+
@@ -595,7 +595,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle 
*file_handle, int type TSR
CG(active_op_array) = original_active_op_array;
if (compilation_successful) {
pass_two(op_array TSRMLS_CC);
-   zend_release_labels(TSRMLS_C);
+   zend_release_labels(0 TSRMLS_CC);
} else {
efree(op_array);
retval = NULL;
@@ -770,7 +770,7 @@ zend_op_array *compile_string(zval *source_string, char 
*filename TSRMLS_DC)
zend_do_return(NULL, 0 TSRMLS_CC);
CG(active_op_array) = original_active_op_array;
pass_two(op_array TSRMLS_CC);
-   zend_release_labels(TSRMLS_C);
+   zend_release_labels(0 TSRMLS_CC);
retval = op_array;
}
}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index cc54557..97c938e 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -593,7 +593,7 @@ ZEND_API zend_op_array

[PHP-CVS] com php-src: Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c: NEWS Zend/zend_ini_scanner.c

2013-03-27 Thread Lars Strojny 
Commit:25b3c949440471ac39ec7126b9f15fc4cbc675ea
Author:Lars Strojny lstro...@php.net Wed, 27 Mar 2013 21:30:56 
+0100
Parents:   05016b7e960148b0d2d5bde279c22e05bc42d518
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=25b3c949440471ac39ec7126b9f15fc4cbc675ea

Log:
Added XOR support for expressions in INI parser: NEWS and 
zend_language_scanner.c

Changed paths:
  M  NEWS
  M  Zend/zend_ini_scanner.c

diff --git a/NEWS b/NEWS
index 2a57c34..c1cd3e1 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP   
 NEWS
 'zendparse'). (Laruence)
   . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11).
 (Dmitry, Laruence)
+  . Fixed bug #64523, allow XOR in php.ini. (Dejan Marjanovic, Lars)
 
 - Opcache:
   . Fixed bug # 64490 (struct flock undefined on FreeBSD). (Joe Watkins)
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 35d9763..87ba664 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -381,7 +381,7 @@ yyc_INITIAL:
144, 144, 144, 144, 144, 144, 144, 144, 
144, 144, 144, 144, 144, 144, 144, 144, 
144, 144, 144, 144, 144, 144, 144, 144, 
-   144, 144, 144, 128, 144, 144, 144, 144, 
+   144, 144, 144, 128, 144, 144, 128, 144, 
144, 144, 144, 144, 144, 144, 144, 144, 
144, 144, 144, 144, 144, 144, 144, 144, 
144, 144, 144, 144, 144, 144, 144, 144, 
@@ -419,6 +419,7 @@ yyc_INITIAL:
case '':
case '(':
case ')':
+   case '^':
case '{':
case '|':
case '}':
@@ -437,8 +438,7 @@ yyc_INITIAL:
case '':
case '?':
case '@':
-   case ']':
-   case '^':   goto yy13;
+   case ']':   goto yy13;
case ';':   goto yy14;
case '=':   goto yy16;
case 'F':
@@ -695,35 +695,33 @@ yy31:
if (yybm[0+yych]  64) {
goto yy31;
}
-   if (yych = '') {
-   if (yych = '\r') {
-   if (yych = '\t') {
+   if (yych = '\'') {
+   if (yych = ' ') {
+   if (yych = '\n') {
if (yych = 0x08) goto yy25;
-   goto yy34;
+   if (yych = '\t') goto yy34;
} else {
-   if (yych = '\n') goto yy33;
-   if (yych = '\f') goto yy25;
+   if (yych != '\r') goto yy25;
}
} else {
-   if (yych = '#') {
-   if (yych = ' ') goto yy25;
-   if (yych = '#') goto yy25;
+   if (yych = '$') {
+   if (yych == '#') goto yy25;
} else {
-   if (yych == '%') goto yy25;
+   if (yych != '') goto yy25;
}
}
} else {
-   if (yych = '') {
-   if (yych = ')') {
-   if (yych = '\'') goto yy25;
+   if (yych = 'Z') {
+   if (yych = ';') {
+   if (yych = ')') goto yy33;
+   if (yych = ':') goto yy25;
} else {
-   if (yych != ';') goto yy25;
+   if (yych != '=') goto yy25;
}
} else {
-   if (yych = '[') {
-   if (yych = '=') goto yy33;
-   if (yych = 'Z') goto yy25;
-   goto yy28;
+   if (yych = '^') {
+   if (yych = '[') goto yy28;
+   if (yych = ']') goto yy25;
} else {
if (yych = 'z') goto yy25;
if (yych = 0x7F) goto yy25;
@@ -737,7 +735,7 @@ yy33:
{ /* TRUE value (when used outside option value/offset this 
causes parse error!) */
RETURN_TOKEN(BOOL_TRUE,

[PHP-CVS] com php-src: Added XOR support for expressions in INI parser: Zend/zend_ini_parser.y Zend/zend_ini_scanner.l tests/func/011.phpt tests/func/bug64523.phpt

2013-03-27 Thread Lars Strojny 
Commit:05016b7e960148b0d2d5bde279c22e05bc42d518
Author:Dejan Marjanovic dejan.marjano...@gmail.com Tue, 26 Mar 
2013 23:54:09 +0100
Committer: Lars Strojny lstro...@php.net  Wed, 27 Mar 2013 21:28:53 +0100
Parents:   6e8aa096964e1d723a9cae3572b2f0affa4e53c0
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=05016b7e960148b0d2d5bde279c22e05bc42d518

Log:
Added XOR support for expressions in INI parser

Changed paths:
  M  Zend/zend_ini_parser.y
  M  Zend/zend_ini_scanner.l
  A  tests/func/011.phpt
  A  tests/func/bug64523.phpt


Diff:
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 2d428c3..901baba 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -67,6 +67,9 @@ static void zend_ini_do_op(char type, zval *result, zval 
*op1, zval *op2)
case '':
i_result = i_op1  i_op2;
break;
+   case '^':
+   i_result = i_op1 ^ i_op2;
+   break;
case '~':
i_result = ~i_op1;
break;
@@ -264,7 +267,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool 
unbuffered_errors, int s
 %token BOOL_FALSE
 %token END_OF_LINE
 %token '=' ':' ',' '.' '' '\'' '^' '+' '-' '/' '*' '%' '$' '~' '' '' '?' 
'@' '{' '}'
-%left '|' ''
+%left '|' '' '^'
 %right '~' '!'
 
 %%
@@ -348,6 +351,7 @@ expr:
var_string_list { $$ = $1; }
|   expr '|' expr   { 
zend_ini_do_op('|', $$, $1, $3); }
|   expr '' expr   { 
zend_ini_do_op('', $$, $1, $3); }
+   |   expr '^' expr   { 
zend_ini_do_op('^', $$, $1, $3); }
|   '~' expr{ 
zend_ini_do_op('~', $$, $2, NULL); }
|   '!' expr{ 
zend_ini_do_op('!', $$, $2, NULL); }
|   '(' expr ')'{ $$ = $2; }
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 5fb28d4..92fb08f 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -340,9 +340,9 @@ NEWLINE (\r|\n|\r\n)
 TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
 CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
-LABEL [^=\n\r\t;|$~(){}!\[]+
-TOKENS [:,.\[\]'()|^+-/*=%$!~?@{}]
-OPERATORS [|~()!]
+LABEL [^=\n\r\t;|^$~(){}!\[]+
+TOKENS [:,.\[\]'()|^+-/*=%$!~?@{}]
+OPERATORS [|^~()!]
 DOLLAR_CURLY ${
 
 SECTION_RAW_CHARS [^\]\n\r]
@@ -350,7 +350,7 @@ SINGLE_QUOTED_CHARS [^']
 RAW_VALUE_CHARS [^\n\r;\000]
 
 LITERAL_DOLLAR ($([^{\000]|(\\{ANY_CHAR})))
-VALUE_CHARS ([^$= \t\n\r;|~()!'\000]|{LITERAL_DOLLAR})
+VALUE_CHARS ([^$= \t\n\r;|^~()!'\000]|{LITERAL_DOLLAR})
 SECTION_VALUE_CHARS ([^$\n\r;'\]\\]|(\\{ANY_CHAR})|{LITERAL_DOLLAR})
 
 !* := yyleng = YYCURSOR - SCNG(yy_text);
diff --git a/tests/func/011.phpt b/tests/func/011.phpt
new file mode 100644
index 000..ec93214
--- /dev/null
+++ b/tests/func/011.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test bitwise AND, OR, XOR, NOT and logical NOT in INI via error_reporting
+--INI--
+error_reporting = E_ALL  E_NOTICE | E_STRICT ^ E_DEPRECATED  ~E_WARNING | 
!E_ERROR
+--FILE--
+?php
+echo ini_get('error_reporting');
+?
+--EXPECT--
+10248
diff --git a/tests/func/bug64523.phpt b/tests/func/bug64523.phpt
new file mode 100644
index 000..e0092ad
--- /dev/null
+++ b/tests/func/bug64523.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #64523: XOR not parsed in INI
+--INI--
+error_reporting = E_ALL ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED
+--FILE--
+?php
+echo ini_get('error_reporting');
+?
+--EXPECTF--
+22519


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

[PHP-CVS] com php-src: fix NEWS: NEWS

2013-03-27 Thread Stanislav Malyshev 
Commit:210d43d7a2e611496dcfa0f1d794e24fbcc5ae5d
Author:Stanislav Malyshev s...@php.net Wed, 27 Mar 2013 13:57:53 
-0700
Parents:   85e5e60777209c13c71785da31af86a5e0a98d92
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=210d43d7a2e611496dcfa0f1d794e24fbcc5ae5d

Log:
fix NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index c085d8f..a55911d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PHP 
   NEWS
 ?? ??? 2013, PHP 5.4.14
 - Core
   . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
-  . Fixed bug #64515 (Memoryleak when using the same variablename 2times in
+  . Fixed bug #64515 (Memoryleak when using the same variablename two times in
 function declaration). (Laruence)
   . Fixed bug #64432 (more empty delimiter warning in strX methods). (Laruence)
   . Fixed bug #64417 (ArrayAccess::offsetGet() in a trait causes fatal error).
@@ -67,7 +67,8 @@ PHP   
 NEWS
 - SOAP
   . Added check that soap.wsdl_cache_dir conforms to open_basedir
 (CVE-2013-1635). (Dmitry)
-  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
+  . Disabled external entities loading (CVE-2013-1643, CVE-2013-1824). 
+(Dmitry)
 
 - Phar:
   . Fixed timestamp update on Phar contents modification. (Dmitry)


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

[PHP-CVS] com php-src: will be 5.4.15: NEWS configure.in main/php_version.h

2013-03-27 Thread Stanislav Malyshev 
Commit:f982aaafa7a3070c78da4b46bbdee9ecae02fd02
Author:Stanislav Malyshev s...@php.net Wed, 27 Mar 2013 13:59:29 
-0700
Parents:   210d43d7a2e611496dcfa0f1d794e24fbcc5ae5d
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=f982aaafa7a3070c78da4b46bbdee9ecae02fd02

Log:
will be 5.4.15

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index a55911d..eebe204 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? ??? 2013, PHP 5.4.15
+
 ?? ??? 2013, PHP 5.4.14
 - Core
   . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
diff --git a/configure.in b/configure.in
index c0700b4..12f5bc2 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=14
+PHP_RELEASE_VERSION=15
 PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 9d0b61f..634ef82 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 14
+#define PHP_RELEASE_VERSION 15
 #define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.4.14-dev
-#define PHP_VERSION_ID 50414
+#define PHP_VERSION 5.4.15-dev
+#define PHP_VERSION_ID 50415


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

[PHP-CVS] com php-src: 5.4.14 RC1: NEWS configure.in main/php_version.h

2013-03-27 Thread Stanislav Malyshev 
Commit:b4e4a2c7aea8cc0b59b7836463bdd2d214b83177
Author:Stanislav Malyshev s...@php.net Wed, 27 Mar 2013 14:04:26 
-0700
Parents:   210d43d7a2e611496dcfa0f1d794e24fbcc5ae5d
Branches:  PHP-5.4.14

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b4e4a2c7aea8cc0b59b7836463bdd2d214b83177

Log:
5.4.14 RC1

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index a55911d..da469dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 2013, PHP 5.4.14
+28 Mar 2013, PHP 5.4.14 RC1
 - Core
   . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
   . Fixed bug #64515 (Memoryleak when using the same variablename two times in
diff --git a/configure.in b/configure.in
index c0700b4..e9c35b7 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=14
-PHP_EXTRA_VERSION=-dev
+PHP_EXTRA_VERSION=RC1
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index 9d0b61f..cb84735 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 14
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.4.14-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 5.4.14RC1
 #define PHP_VERSION_ID 50414


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

[PHP-CVS] tag php-src: create tag php-5.4.14RC1

2013-03-27 Thread Stanislav Malyshev 
Tag php-5.4.14RC1 in php-src.git was created
Tag: ebd800742b9e024808bdc1a5bcbe8367a784dca8
Tagger:  Stanislav Malyshevs...@php.net Wed Mar 27 14:05:30 2013 
-0700
Log:
5.4.14RC1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (Darwin)

iF4EABEIAAYFAlFTXx4ACgkQL3lWvF2gS11AAwEAgRwrh1l+fvdoZVlewJZZ124v
oF5N7A6jBTO9mu4NzKoBAJVdRp8NGq2lydA/JH5hHmb+nUbjEr/Lmh+kq+m7U2kA
=aOGL
-END PGP SIGNATURE-

Link: 
http://git.php.net/?p=php-src.git;a=tag;h=ebd800742b9e024808bdc1a5bcbe8367a784dca8

Target:  b4e4a2c7aea8cc0b59b7836463bdd2d214b83177
Author:  Stanislav Malyshev s...@php.net Wed, 27 Mar 2013 
14:04:26 -0700
Parents: 210d43d7a2e611496dcfa0f1d794e24fbcc5ae5d
Target link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=b4e4a2c7aea8cc0b59b7836463bdd2d214b83177
Target log:
5.4.14 RC1

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h



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

[PHP-CVS] com php-src: Add test for #64529: sapi/cli/tests/bug64529.phpt

2013-03-27 Thread Xinchen Hui 
Commit:467cd6a60f2909c14e5273e3fd4a98953779a5b8
Author:Xinchen Hui larue...@php.net Thu, 28 Mar 2013 13:45:42 
+0800
Parents:   1182a3356c6c1989a686aab5258e1d47c56b2955
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=467cd6a60f2909c14e5273e3fd4a98953779a5b8

Log:
Add test for #64529

Bugs:
https://bugs.php.net/64529

Changed paths:
  A  sapi/cli/tests/bug64529.phpt


Diff:
diff --git a/sapi/cli/tests/bug64529.phpt b/sapi/cli/tests/bug64529.phpt
new file mode 100644
index 000..0c2d0e1
--- /dev/null
+++ b/sapi/cli/tests/bug64529.phpt
@@ -0,0 +1,62 @@
+--TEST--
+Bug #64529 (Ran out of opcode space)
+--SKIPIF--
+?php
+if (substr(PHP_OS, 0, 3) == WIN) die(skip non windows test);
+if (!trim(`which expect`)) die skip no expect installed;
+?
+--FILE--
+?php
+$expect_executable = trim(`which expect`);
+$php_executable = getenv('TEST_PHP_EXECUTABLE');
+$script = __DIR__ . /expect.sh;
+
+if (extension_loaded(readline)) {
+   $expect_script = SCRIPT
+
+set php_executable [lindex \$argv 0]
+
+spawn \$php_executable -n -a
+
+expect php 
+
+send echo 'hello world';\n
+send \04
+
+expect eof
+
+exit
+
+SCRIPT;
+
+} else {
+   $expect_script = SCRIPT
+
+set php_executable [lindex \$argv 0]
+
+spawn \$php_executable -n -a
+
+expect Interactive mode enabled
+
+send ?php echo 'hello world';\n
+send \04
+
+expect eof
+
+exit
+
+SCRIPT;
+}
+
+file_put_contents($script, $expect_script);
+
+system($expect_executable .   . $script .   . $php_executable);
+
+@unlink($script);
+?
+--EXPECTF--
+spawn %sphp -n -a
+Interactive %s
+
+%secho 'hello world';
+hello worl%s


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