php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,447 Commits 547 Branches 1,481 Tags
29b43af07252ff7fa6c8ca2504f96af09b50c19c
Commit Graph

1582 Commits

Author SHA1 Message Date
Dmitry Stogov
4fd435abab Embed FETCH_CLASS <string> into the following NEW 2014-10-23 11:52:34 +04:00
Tjerk Meesters
1f4f2ef403 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68128

Conflicts:
	ext/spl/spl_iterators.c
 2014-10-14 23:00:17 +08:00
Tjerk Meesters
fb35d7c56e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68128
 2014-10-14 22:50:07 +08:00
Tjerk Meesters
71ba533640 Fixed bug #68128 
Three issues are addressed:

- RecursiveRegexIterator::accept() should accept non-empty arrays without
  applying any regular expression and RegexIterator::accept() should not accept
  an array.
- RegexIterator::accept() should not accept an atom that fails to match
  anything, even when PREG_PATTERN_ORDER is used (which would return an array
  of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
  to its child iterator instead of just the regular expression.
 2014-10-14 22:49:01 +08:00
Nikita Popov
471e71537f Remove retval member in spl_dllist 
Seems pretty useless, unless I'm missing something?
 2014-10-12 20:55:51 +02:00
Nikita Popov
e5e9d8346f Remove zend_get_class_entry function 2014-10-09 14:17:30 +02:00
Nikita Popov
43f1c94dda Review a few more SEPARATE_ZVAL_IF_NOT_REF usages 2014-10-09 12:51:05 +02:00
Dmitry Stogov
bd9a234645 Replaced EG(This) and EX(object) with EX(This). 
Internal functions now recieves zend_execute_data as the first argument.
 2014-10-03 19:32:46 +04:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
bccc653185 Avoid double IS_INTERNED() check 2014-09-19 17:32:50 +04:00
Dmitry Stogov
3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Anatol Belski
efc12d468c reduce the struct size by 8 byte on 64 bit 2014-09-17 09:10:26 +02:00
Anatol Belski
fc6f7bfcf3 fix signed/unsigned mismatch 2014-09-16 21:17:25 +02:00
Anatol Belski
a9c188fbc6 reduce struct size by 8 byte on 64 bit 2014-09-14 11:26:17 +02:00
Anatol Belski
a32e493d84 reduce struct size by 8 byte on 64 bit 2014-09-13 23:21:52 +02:00
Anatol Belski
b89d7ae5ba fix dir separators in test 2014-08-31 14:02:30 +02:00
Anatol Belski
bf96ee95ce 's' works with size_t round 4 2014-08-27 20:49:37 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Julien Pauli
0686b4448d implement #67886 2014-08-26 10:02:55 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
5d62cf2f7d fix zpp 2014-08-21 15:36:33 +02:00
Anatol Belski
7ef536e4c9 Merge remote-tracking branch 'php/master' 
Conflicts:
	Zend/zend_exceptions.c
 2014-08-21 13:54:15 +02:00
Dmitry Stogov
e9439f62e5 Avoid reallocation and copying 2014-08-21 12:02:48 +04:00
Anatol Belski
4498f93c0e more fixes to ext/spl 2014-08-20 18:06:01 +02:00
Anatol Belski
a5ffd245bd fixed splfixedarray 2014-08-18 19:55:05 +02:00
Anatol Belski
77eb6e7278 Merge branch 'master' of git.php.net:php-src 
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
 2014-08-17 21:40:39 +02:00
Lior Kaplan
741605da73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Correct typo in comments: 'initialized'

Conflicts:
	ext/dom/php_dom.c
	ext/spl/php_spl.c
 2014-08-17 21:37:22 +03:00
Lior Kaplan
f1d0e50ea8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Correct typo in comments: 'initialized'
 2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Correct typo in comments: 'initialized'
 2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630 Correct typo in comments: 'initialized' 2014-08-17 21:32:53 +03:00
Lior Kaplan
543d5eb495 Merge branch 'PHP-5.6' 
* PHP-5.6:
  typofixes

Conflicts:
	ext/spl/php_spl.c
 2014-08-17 15:53:33 +03:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typofixes
 2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Anatol Belski
90d6f60bc1 mostly fixes to spl, but also some other 2014-08-17 13:31:39 +02:00
Anatol Belski
1169de3e61 fix some cases with fast zpp 2014-08-16 14:00:02 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Dmitry Stogov
05eaed4345 Merge branch 'master' into phpng 
* master:
  fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
  Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
 2014-08-12 14:46:38 +04:00
Xinchen Hui
dc06b4f941 Merge branch 'PHP-5.6' 2014-08-11 17:47:47 +08:00
Xinchen Hui
1f496744ed Merge branch 'PHP-5.5' into PHP-5.6 2014-08-11 17:47:36 +08:00
Xinchen Hui
b6ddcf9c71 Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) 2014-08-11 17:46:56 +08:00
krakjoe
dc70139d85 update zend_make_printable_zval to take TSRM context 2014-08-11 06:09:46 +01:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng 
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
 2014-08-04 13:56:27 +04:00