php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,197 Commits 549 Branches 1,486 Tags
4ea10696e8ffc3779f0cc73ab11c2214ab2bed47
Commit Graph

81197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov 4ea10696e8 Prevent double resource free 2014-05-19 11:50:38 +04:00
Xinchen Hui 82a4897446 Use new iterator macros 2014-05-19 10:55:09 +08:00
Xinchen Hui f2d1ace1b4 This should be this (broken compiling before) 2014-05-19 10:26:10 +08:00
Xinchen Hui 3eeb0dc9f7 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-19 10:21:13 +08:00
Dmitry Stogov 21da8af578 Removed the old hack that was originally developed to support constants in array indeces, and isn't needed anymore after the Bob's patch. 2014-05-19 01:20:56 +04:00
Dmitry Stogov d07c1941ec Use new hash iteration API and avoid old zend_hash_update_current_key() hack 2014-05-19 00:50:00 +04:00
Dmitry Stogov b11a30f5ea Merge branch 'master' into phpng 
* master:
  Support for __debugInfo (Joe Watkins)
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  Prevent recursion in ZF2 Parameters class
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/opcache/zend_persist.c
	ext/spl/spl_array.c
 2014-05-18 21:17:31 +04:00
Dmitry Stogov 91c475fc00 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
 2014-05-18 20:56:34 +04:00
Dmitry Stogov 1d1fdfb51d Support for __debugInfo (Joe Watkins) 2014-05-18 20:55:40 +04:00
Dmitry Stogov 0019b512ff Merge branch 'PHP-5.6' 
* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
 2014-05-18 20:51:37 +04:00
Dmitry Stogov 3fff53fc57 Optimize ZEND_POW (Rouven Weßling) 2014-05-18 20:48:16 +04:00
Nuno Lopes 1759905a23 gcov: tentative fix for broken coverage data after fix for opcache coverage 
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
 2014-05-18 11:23:21 -04:00
Nuno Lopes 4f8a84b2e7 gcov: tentative fix for broken coverage data after fix for opcache coverage 
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
 2014-05-18 11:21:05 -04:00
Tjerk Meesters 6aac353acc Merge branch 'PHP-5.6' 
Conflicts:
	ext/spl/spl_array.c
 2014-05-18 22:51:36 +08:00
Xinchen Hui 583bb6339b Merge branch 'phpng' of git.php.net:/php-src into phpng 
Conflicts:
	ext/pdo/pdo_sql_parser.c
 2014-05-18 21:06:44 +08:00
Xinchen Hui d86fa38cc5 Fixed uninitialized used 2014-05-18 21:04:43 +08:00
Xinchen Hui b0ecac6ba8 Fixed uninitialized used 2014-05-18 20:55:06 +08:00
Xinchen Hui 204e580fcd Fixed Hash API usage 2014-05-18 20:25:07 +08:00
Xinchen Hui af3829608d Fixed Hash API usage 2014-05-18 20:23:26 +08:00
Dmitry Stogov 32b58b2e07 phpng support for ext/readline 2014-05-18 15:49:35 +04:00
Dmitry Stogov 0c27dedb6a phpng support for ext/enchant 2014-05-18 15:04:04 +04:00
Dmitry Stogov 41336194b5 Fixed wrong condition 2014-05-18 13:28:06 +04:00
Dmitry Stogov c7e6d3acce Regenerated parser 2014-05-18 13:27:54 +04:00
Pierre Joye f3963e77ac Merge branch 'phpng' of git.php.net:php-src into phpng 
# By Xinchen Hui
# Via Xinchen Hui
* 'phpng' of git.php.net:php-src:
  Fixed Hash API usage (it's in comments)
  Fixed Zend Hash API usage (although it's in comments)
  Fixed several tests failes
 2014-05-18 11:19:31 +02:00
Pierre Joye fca1e0c574 more port to phpng, zend_string and hash, work in progress 2014-05-18 11:19:02 +02:00
Xinchen Hui 4ababc3a41 Fixed Hash API usage (it's in comments) 2014-05-18 12:09:14 +08:00
Xinchen Hui eb5c613311 Fixed Zend Hash API usage (although it's in comments) 2014-05-18 12:05:36 +08:00
Xinchen Hui 3cbdcdc2c8 Fixed several tests failes 2014-05-18 12:02:54 +08:00
Xinchen Hui 0d3cd2486a Finish ext/sockets 2014-05-18 12:02:05 +08:00
Pierre Joye 6223702cf4 fix smart string usage (work in progress), ps: a lot of len tests are done twice or more, rooms for cleanup here 2014-05-17 15:34:03 +02:00
Pierre Joye bd1aae54eb fix init, new smart_str struct (use zend_string now) 2014-05-17 15:29:25 +02:00
Pierre Joye 77ba802726 Merge branch 'phpng' of git.php.net:php-src into phpng 
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed new hash API usage
 2014-05-17 15:05:48 +02:00
Dmitry Stogov feeebc2e05 Fixed new hash API usage 2014-05-17 11:48:29 +04:00
Pierre Joye e9eb642a36 fix hash API calls 2014-05-17 08:12:18 +02:00
Pierre Joye 81f45d50a1 fix signature according to apply_func_arg_t 2014-05-17 05:54:06 +02:00
Pierre Joye 0ba3aec5f7 only used if HAVE_NOFOLLOW 2014-05-17 05:50:01 +02:00
Pierre Joye c0bd24b502 Z_TYPE_PP > Z_TYPE_P 2014-05-17 05:44:26 +02:00
Pierre Joye 5939345fd5 Merge branch 'phpng' of git.php.net:php-src into phpng 
# By Dmitry Stogov (5) and Xinchen Hui (3)
# Via Xinchen Hui (3) and Dmitry Stogov (2)
* 'phpng' of git.php.net:php-src:
  Fixed signed
  Refactoring socket (only compilable now)
  it make no sense to create a reference to object
  Initialize zvals
  Fixed <any> with XML references
  Refactored shmop
  Fixed pointer mess (use * instead of **)
  Fixed support for XML references
 2014-05-17 05:42:00 +02:00
Pierre Joye 9b44d687df fix zend_hash_get_current_data_ptr_ex call 2014-05-17 05:41:21 +02:00
Xinchen Hui 84eeae80d8 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-17 10:39:05 +08:00
Xinchen Hui a4a1fc5552 Fixed signed 2014-05-17 10:28:54 +08:00
Xinchen Hui 489da59b08 Refactoring socket (only compilable now) 2014-05-17 10:23:46 +08:00
Dmitry Stogov fa4b281c56 Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  Refactored shmop
 2014-05-16 20:21:08 +04:00
Dmitry Stogov fe7d22ddd4 it make no sense to create a reference to object 2014-05-16 20:20:17 +04:00
Dmitry Stogov e743089d55 Initialize zvals 2014-05-16 19:43:49 +04:00
Dmitry Stogov e159955d15 Fixed <any> with XML references 2014-05-16 18:11:28 +04:00
Xinchen Hui bcb4fcd305 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-16 22:02:19 +08:00
Xinchen Hui 8b7a3b2d05 Refactored shmop 2014-05-16 22:00:04 +08:00
Dmitry Stogov 89dbe07449 Fixed pointer mess (use * instead of **) 2014-05-16 16:56:36 +04:00
Dmitry Stogov 5eb273cfec Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  hash find returns zval* now
 2014-05-16 16:35:37 +04:00