1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Commit Graph

38565 Commits

Author SHA1 Message Date
Nikita Popov
fc264da0e5 Cleanup substr_replace 2015-04-27 18:58:47 +02:00
Nikita Popov
40e465e357 Clean up some type conversions
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
2015-04-27 18:50:08 +02:00
Dmitry Stogov
5af7743cf5 Merge branch 'anon'
* anon:
  Pass class_entry through IS_VAR to avoid hash lookup in ZEND_NEW.
  Use "safe" anonymous class names. Don't show the mangled names through var_dump().
  Refactored using specialized opcodes
  Fix implementing_class handling
  More cleanup (mainly retab)
  Don't issue FETCH_CLASS for anon classes
  More retab
  Simply anon class name generation
  Retab
  Revert unrelated changes / rebase fixup
  Rebase Joe's anon classes implementation
2015-04-27 17:18:35 +03:00
Dmitry Stogov
ffe804a50c Use new hash iteration API. 2015-04-27 16:50:47 +03:00
Dmitry Stogov
94245bc14c Refactored using specialized opcodes 2015-04-27 12:24:39 +03:00
krakjoe
49608e0608 Rebase Joe's anon classes implementation 2015-04-26 15:04:22 +02:00
Derick Rethans
1a4d3e4855 Merge branch 'PHP-5.6' 2015-04-26 11:04:54 +01:00
Derick Rethans
1e18ffd2f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-26 11:04:35 +01:00
Derick Rethans
957aa220aa Fixed location reading due to file format changes 2015-04-26 11:04:16 +01:00
Nikita Popov
300b1db09f Tweak new deflate/inflate implementations
Return NULL on zpp.
Don't manually cast zvals to long.
2015-04-25 19:00:41 +02:00
Nikita Popov
e0a39eecf1 Respect USE_OTHER in spl_array_is_object
Also a bit of code cleanup in get_hash_table.
2015-04-25 16:13:39 +02:00
Nikita Popov
66ce7cc083 Don't store $this reference for IS_SELF AO
The var_dump output changes in array_022.phpt were wrong previously,
the "storage" that was referenced there was not the actually used
storage.
2015-04-25 16:13:37 +02:00
Nikita Popov
3140d0c0c8 Drop ArrayObject IS_REF flag 2015-04-25 16:13:32 +02:00
Derick Rethans
0cfbdb7200 - Updated to version 2015.4 (2015d) 2015-04-24 22:56:26 +01:00
Derick Rethans
ad9aaf8093 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:33 +01:00
Derick Rethans
53c49994f2 - Updated to version 2015.4 (2015d) 2015-04-24 17:22:31 +01:00
Nikita Popov
2a87a42cd4 Dropped CN_match and SNI_server_name context options 2015-04-24 18:18:18 +02:00
Nikita Popov
4694e1c020 Remove PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
Use the generic ATTR_EMULATE_PREPARES instead.
2015-04-24 18:08:18 +02:00
Daniel Lowrey
38ea6a827e Fix vim folding block 2015-04-24 09:27:24 -06:00
Daniel Lowrey
852904173e Merge branch 'deflate'
* deflate:
  Add inflate_*() test cases
  Add incremental zlib inflate API
  Add deflate_*() test cases
  Several deflate_* changes (more after the jump)
  Add incremental zlib deflate API
2015-04-24 09:02:59 -06:00
Yasuo Ohgaki
e881017a75 Merge branch 'PHP-5.6'
* PHP-5.6:
  Set NULL after efree
2015-04-24 16:06:41 +09:00
Yasuo Ohgaki
02ff308e27 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Set NULL after efree
2015-04-24 16:05:50 +09:00
Yasuo Ohgaki
4c711200b4 Set NULL after efree 2015-04-24 16:04:01 +09:00
Dmitry Stogov
6265687768 Added HashTable flag HASH_FLAG_STATIC_KEYS that is maintaned to be set if all hash table keys are numbers or interned strings.
Take this flag into account when copy or destroy HashTable to avoud useless checks for each key.
2015-04-24 09:34:50 +03:00
Daniel Lowrey
0e62416101 Add inflate_*() test cases 2015-04-23 23:50:59 -06:00
Daniel Lowrey
585037c196 Add incremental zlib inflate API 2015-04-23 23:50:56 -06:00
Daniel Lowrey
4d5324088c Add deflate_*() test cases 2015-04-23 23:49:41 -06:00
Daniel Lowrey
daecc32618 Several deflate_* changes (more after the jump)
- Remove deflate_flush()
- Add ZLIB_FINISH constant for use with deflate_add()
- Use options array at parameter 2 of deflate_add() to insulate
  against future API changes
- Minor bug fixes
- deflate_init() and deflate_add() now always return FALSE in the
  event of an error
2015-04-23 23:49:35 -06:00
Dmitry Stogov
49cf7c5d12 Don't propogate "fake" EX(called_scope) and EX(This) into each internal function.
They need quite seldom and it's cheaper to get them from corresponfing upper stack frame.
2015-04-23 12:16:37 +03:00
Dmitry Stogov
801768f72c Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  libpq versions older than 9.3 do not have lo_lseek64
  fix include with vc14
  fix compilation with vc14
  improve zpp readme
2015-04-23 03:43:55 +03:00
Dmitry Stogov
6d4da2db8a Make internal non-static methods to be executed in context of class. Set EG(scope) accordingly. 2015-04-23 03:41:50 +03:00
Rasmus Lerdorf
1ce2206244 libpq versions older than 9.3 do not have lo_lseek64 2015-04-22 16:15:28 -07:00
Anatol Belski
6a1bf93ad9 fix compilation with vc14 2015-04-22 22:25:33 +02:00
Dmitry Stogov
15a5f61cf4 Use fast method to check if first arguments should be passed by reference (not tested onbig endian). 2015-04-22 21:46:13 +03:00
Bob Weinand
e0e1d99c71 Add incremental zlib deflate API 2015-04-22 06:04:13 -06:00
Kalle Sommer Nielsen
ceb1ea37ad Windows support for sysvshm
A little background:
* key_t is an int, like ext/shmop
* There is no ftok() (from ext/standard), so tests have a new check to see whether or not it is available. This however means that the 7 tests will all be skipped for Windows. I know we cannot properly implement an ftok() function since there is no inodes for NTFS, maybe we should look into using the GetFileInfoByHandle() or similar to use the system unique ID for a file to get the same functionality, Anatol?
* Despite the lack of phpt's, local testing works flawlessly but we better look into a solution for this if we are to keep this patch
2015-04-22 09:29:45 +02:00
Xinchen Hui
9db4e25927 Since 5.6 stat.cwd using emalloc (Thanks to Remi) 2015-04-22 15:14:00 +08:00
Dmitry Stogov
770cb1da71 Keep realpath and PCRE caches in consistency with opcache SHM. 2015-04-22 02:29:06 +03:00
Dmitry Stogov
a0c07c90f2 Fixed zend_string related inconsistencies 2015-04-21 23:26:34 +03:00
Dmitry Stogov
ca76a86fe6 Removed deprecated code 2015-04-21 11:48:43 +03:00
Dmitry Stogov
81a9505742 Compact HashTables to reduce SHM usage 2015-04-21 00:27:21 +03:00
Dmitry Stogov
b1a03d7d39 Removed invalid code 2015-04-20 16:48:49 +03:00
Xinchen Hui
d66045fe73 Fixed bug #69485 (Double free on zend_list_dtor). 2015-04-20 11:48:21 +08:00
Anatol Belski
4a38f51857 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  fix more dir separators
2015-04-19 20:34:36 +02:00
Anatol Belski
0ec5477fbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fix more dir separators
2015-04-19 20:32:37 +02:00
Anatol Belski
a0accfa59f fix more dir separators 2015-04-19 20:27:28 +02:00
Stanislav Malyshev
4eb375320e Merge branch 'pull-request/1239'
* pull-request/1239:
  fixes confusing SQLDescribeParam error message
2015-04-18 20:45:16 -07:00
Stanislav Malyshev
dd56598d0d Merge branch 'pull-request/1238'
* pull-request/1238:
  apply a patch
2015-04-18 19:51:22 -07:00
Stanislav Malyshev
80bd148cc9 Merge branch 'pull-request/1235'
* pull-request/1235:
  modify skeleton confirm_extname_compiled
  modify skeleton.c function
2015-04-18 19:36:37 -07:00
Stanislav Malyshev
cb9f58d046 Merge branch 'pull-request/1203'
* pull-request/1203:
  Update openssl.c
2015-04-18 19:32:14 -07:00