php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
89,798 Commits 549 Branches 1,485 Tags
6551f996b90b69d29d7ad659c8d7cd4fa6e18b48
Commit Graph

381 Commits

Author SHA1 Message Date
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
Remi Collet c48bf6e55c Merge branch 'PHP-5.6' 
* PHP-5.6:
  bump zip release to match pecl version
 2015-04-15 17:38:01 +02:00
Remi Collet 60b3526bfb bump zip release to match pecl version 2015-04-15 17:37:12 +02:00
Rasmus Lerdorf 4d10e15845 Fix a couple of warnings 2015-03-20 23:32:07 -07:00
Stanislav Malyshev 1ecd82f588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
	ext/ereg/regex/regcomp.c
	ext/standard/basic_functions.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	win32/registry.c
 2015-03-17 22:04:39 -07:00
Stanislav Malyshev 225cb973e5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
	ext/zip/lib/zip_dirent.c
 2015-03-17 22:03:24 -07:00
Stanislav Malyshev 53eff4a369 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
 2015-03-17 22:00:29 -07:00
Stanislav Malyshev ef8fc4b53d Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary 2015-03-17 21:59:56 -07:00
Dmitry Stogov 8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
zxcvdavid f1de275e74 Remove the unused vars 2015-03-04 09:52:09 +08:00
Dmitry Stogov 2fa8d67a5c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
Dmitry Stogov 9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Xinchen Hui 942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Xinchen Hui b21d9123a5 Fixed #68826 (Resource leak) 2015-01-17 22:56:02 -05:00
Xinchen Hui fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Andrea Faulds 8a065c554b Restored zip/oci8 PHP 4 code, add PHP 7 checks 2014-12-05 19:46:31 +00:00
Andrea Faulds c7157e4cfb Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) 2014-12-05 19:46:30 +00:00
Veres Lajos 06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski 42fca62326 improve empty string check 2014-09-17 09:16:59 +02:00
Anatol Belski 454548e440 make it safer for an array underrun 2014-09-14 15:03:52 +02:00
Anatol Belski b6b376efe5 avoid repeated strlen() usage 2014-09-14 12:59:31 +02:00
Anatol Belski 2c66a8c53e better align reduce the struct size by 8 byte on 64 bit 2014-09-13 23:21:51 +02:00
Anatol Belski 7ea780dd6e fix type 2014-09-12 21:35:19 +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 3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski 202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +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 094a78eb69 ported ext/zip 2014-08-19 11:47:21 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov 2ed8a17045 Refactored run_time_cache usage in object handlers 2014-07-07 20:54:31 +04:00
Dmitry Stogov c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov 9dd66e4d53 Merge branch 'master' into phpng 
* master:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  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
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/date/php_date.c
 2014-05-26 10:52:43 +04:00
Xinchen Hui 9b730bf4bf Merge branch 'new-tests' of https://github.com/SammyK/php-src 2014-05-24 15:43:37 +08:00
Sammy Kaye Powers e2bbe95310 Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() 2014-05-23 05:51:13 +00:00
Nikita Popov 4d22be992c Fix ZTS 2014-05-05 17:28:22 +02:00
Xinchen Hui c73c6526ef clean up 2014-05-05 18:09:15 +08:00
Xinchen Hui 39c521c056 Finish Zip (all tests pass) 2014-05-05 17:48:49 +08:00
Xinchen Hui 356824df4c Romove unnecessary proxy macro 2014-05-05 17:44:07 +08:00
Xinchen Hui 7e3989f301 Fixed memory leak in prop_handlers registering 2014-05-05 14:04:52 +08:00
Xinchen Hui ea33fbd833 Don't use this (keyword) 2014-05-05 10:56:18 +08:00
Xinchen Hui bea30846bb Refactor Zip (1 test failed) 2014-05-05 10:49:27 +08:00