clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,493 Commits 494 Branches 1,367 Tags 786 MiB
660b829ccc
Commit Graph

4943 Commits

Author SHA1 Message Date
Anatol Belski
7ec8b8d49f remove casts and ensure no out of bounds access 2017-07-21 22:26:37 +02:00
Sara Golemon
bb02f99e71 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
 2017-07-19 14:01:18 -04:00
Sara Golemon
a9e8239f45 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
 2017-07-19 14:01:00 -04:00
Sara Golemon
c9fd093127
Do not allow using traits/interfaces/abstract classes as stream wrappers 
Fixes https://bugs.php.net/bug.php?id=74951
 2017-07-19 14:00:00 -04:00
Dmitry Stogov
6fcc7134f1 Keep resource of enclosing stream, because it may be referenced from other place(s). 
This fixes valgrind warnings on Zend/tests/type_declarations/scalar_basic.phpt
 2017-07-19 17:16:56 +03:00
Dmitry Stogov
95a1f77b5e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Reset globals on startup or restart
 2017-07-19 15:36:48 +03:00
Dmitry Stogov
4252f14299 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Reset globals on startup or restart
 2017-07-19 15:36:24 +03:00
Dmitry Stogov
e5beb4e828 Reset globals on startup or restart 2017-07-19 15:35:10 +03:00
Joe Watkins
f4323248ec
bump versions 2017-07-18 17:21:19 +01:00
Sara Golemon
05ff0c5180
Bump all API numbers in prep for 7.2 fork 2017-07-18 10:45:02 -04:00
Anatol Belski
649027b963 move to 7.0.23 for dev 2017-07-18 10:25:40 +02:00
Sara Golemon
3de82a0349
Provide zend_string wrappers for php_base64_(en|de)code 
Also pull existing php_base64_decode() proxy out to an inline.
Bump PHP_API_VERSION for ABI change.
 2017-07-16 17:01:20 -04:00
Francois Laupretre
0782a7fc63 Fixed bug #74866 extension_dir = "./ext" now use current directory for base 2017-07-13 14:27:19 +02:00
Anatol Belski
2283b6ff53 eliminate casts 2017-07-10 15:48:54 +02:00
Anatol Belski
72b0a3a892 remove some casts 2017-07-09 15:47:01 +02:00
Anatol Belski
84079f4a1e cleanup casts 2017-07-09 15:31:05 +02:00
Anatol Belski
e403acc74b remove useless cast 2017-07-09 15:15:17 +02:00
Anatol Belski
aaf09f7bdf eliminate casts 2017-07-09 15:11:02 +02:00
Anatol Belski
384f0f8a4c sync vim mode lines in main 2017-07-09 15:07:23 +02:00
Anatol Belski
9ad0d0ca3c replace the stack var by a macro 2017-07-06 20:47:04 +02:00
Anatol Belski
e08c0ed8ce Bug #74815 crash with a combination of INI entries at startup 
TS related VCWD routines depend on CWD. Thus, a premature CWD
deactivation renders the VCWD layer unusable. Same issue seems to
persist in versions < 7.2, just that the code path is actually unused so
the issue didn't show up. Still might make sense to backport this into
lower branches.
 2017-06-27 16:30:10 +02:00
Dmitry Stogov
caaeb4849a Removed EG(valid_symbol_table). Used EG(active) instead. 2017-06-26 13:35:07 +03:00
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Nikita Popov
205807f60e Move va_copy compatibility code into zend_portability.h 
Previously this was defined in zend.c and php.h and also handled
in another way in soap.c.
 2017-06-25 17:00:26 +02:00
Dmitry Stogov
d55b43d9cb Merge branch 'fast_shutdown' 
* fast_shutdown:
  Reseet EG(active) a bit early.
  Reuse "nIndex"
  shutdown_executor() refactoring (reuse opcache fast request shutdown code)
 2017-06-23 14:59:29 +03:00
Sara Golemon
d09edf7b34 Minor refactor of load extension by name impl 
Minimize the #ifdef surface area
Localize orig_libpath to retry scope
Send errors to php_error() rathern than stderr
 2017-06-22 13:13:45 -04:00
Francois Laupretre
fe5c8f2b80 Allow loading PHP and Zend extensions by name 
Allow extension name as INI 'extension=' and dl() argument
No BC break, as file name is still accepted.
When using the '-z' command line option (CLI/CGI), an absolute file name must still be provided (nothing changed here)
Change comments in example INI files
 2017-06-22 12:58:15 -04:00
Dmitry Stogov
f25ecdacf8 shutdown_executor() refactoring (reuse opcache fast request shutdown code) 2017-06-22 01:45:28 +03:00
Dmitry Stogov
7af5741333 Avoid useless duplication 2017-06-21 12:57:24 +03:00
Dmitry Stogov
687123ebf2 Use request heap. 2017-06-21 11:25:05 +03:00
Joe Watkins
78bec63ad9
bump versions 2017-06-20 17:34:00 +01:00
Anatol Belski
b4fa2ba295 move next 2017-06-20 14:05:50 +02:00
Anatol Belski
fb6e718764 fix ticks init in ts build 2017-06-15 23:48:03 +02:00
Kalle Sommer Nielsen
a251d9b2c1 Change PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as suggested by Davey) 2017-06-14 03:29:06 +02:00
Sebastian Bergmann
362d2e42a0 Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY 2017-06-13 15:45:57 +02:00
Xinchen Hui
e33bc38e83 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:45 +08:00
Xinchen Hui
caf35c5cf5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:35 +08:00
Niklas Keller
bec91e1117 Use any TLS crypto method by default, don't use SSL 2017-06-10 17:31:24 -04:00
Manuel Mausz
ee0e6963f3 Fixed bug #74600 
Make sure the hash entry is an array.

The origin fix broke support for HOST/PATH ini sections. Only the
beginning of the string has to match. Revert this check but use
zend_binary_strncasecmp instead of strncasecmp.
 2017-06-09 01:43:08 +02:00
Sara Golemon
e60cedfbc3 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe
 2017-05-28 08:51:41 -07:00
Sara Golemon
e628ee9e9d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe
 2017-05-28 08:49:25 -07:00
Sara Golemon
6d2d0bbda7 Fix abstract name handling to be binary safe 
Per unix(7):
abstract: an abstract socket address is distinguished (from a
pathname socket) by the fact that sun_path[0] is a null byte
('\0').  The socket's address in this namespace is given by the
additional bytes in sun_path that are covered by the specified
length of the address structure.  (Null bytes in the name have no
special significance.)  The name has no connection with filesystem
pathnames.  When the address of an abstract socket is returned,
the returned addrlen is greater than sizeof(sa_family_t) (i.e.,
greater than 2), and the name of the socket is contained in the
first (addrlen - sizeof(sa_family_t)) bytes of sun_path.

The existing implementation was assuming significance in null bytes
contained in the abstract address identifier.
 2017-05-28 08:45:44 -07:00
Joe Watkins
e535b80257
bump versions 2017-05-23 22:04:01 +01:00
Anatol Belski
fff1cab367 time to move next 2017-05-23 12:31:03 +02:00
Dmitry Stogov
a08723d3d3 Use interned empty and "one char" strings. 2017-05-18 17:59:59 +03:00
Xinchen Hui
a33aca545c Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
 2017-05-16 19:33:24 +08:00
Xinchen Hui
c667bb94fa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
 2017-05-16 19:32:59 +08:00
Xinchen Hui
9f49ebb5ba Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i) 2017-05-16 19:32:13 +08:00
Jakub Zelenka
2bce80150f Merge branch 'PHP-7.1' 2017-04-30 20:28:38 +01:00
Jakub Zelenka
9622a3be43 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-30 20:27:39 +01:00