archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
135288 commits 526 branches 1434 tags 873 MiB
Commit graph

237 commits

Author SHA1 Message Date
Stanislav Malyshev
2e267bd3c7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 21:42:08 -07:00
Stanislav Malyshev
1ddf72180a Better fix for bug #70433 2015-09-28 21:41:02 -07:00
Stanislav Malyshev
4c6f4863fa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:45:02 -07:00
Stanislav Malyshev
51b23cd0f0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:44:28 -07:00
Stanislav Malyshev
f98ab19dc0 fix memory leak 2015-09-28 20:43:18 -07:00
Stanislav Malyshev
e7574a5329 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

Conflicts:
	ext/phar/util.c
 2015-09-28 17:00:32 -07:00
Stanislav Malyshev
f39a4ee0c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
 2015-09-28 16:59:46 -07:00
Stanislav Malyshev
d698f0ae51 Fix bug #69720: Null pointer dereference in phar_get_fp_offset() 2015-09-28 15:56:51 -07:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Xinchen Hui
47f2e42fc9 Remove PHAR_GLOBALS (make it respect ZEND_ENABLE_STATIC_TSRMLS_CACHE) 2015-03-09 23:00:56 +08:00
Xinchen Hui
792630bc50 Use strpprintf 2015-03-05 12:40: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
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
Dmitry Stogov
6b20895c21 Use HashTable.u.flags instead of HashTable.arHash to check if HashTable is properly initialized 2014-12-30 00:14:13 +03:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Xinchen Hui
80dd764612 Fixed incompatible pointer 2014-08-26 12:12:39 +08:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
8704e392a1 ported ext/phar 2014-08-19 15:12:13 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
01c8aee7d2 cleanup 2014-08-13 22:18:05 +04:00
Pierre Joye
81f45d50a1 fix signature according to apply_func_arg_t 2014-05-17 05:54:06 +02:00
Dmitry Stogov
f29b68306d Support for ext/phar (all tests passed) 2014-05-12 22:28:31 +04:00
Dmitry Stogov
4288f0486b ext/phar support (incomplete) 2014-05-12 16:43:18 +04:00
Dmitry Stogov
2a31934a1a Support for ext/phar (incomplete) 2014-05-08 21:18:59 +04:00
Dmitry Stogov
df5ad846c6 Support for ext/phar (incomplete) 2014-05-08 18:30:07 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
6c8ff0031c Merge branch 'PHP-5.5' 
Conflicts:
	ext/phar/phar_internal.h
	ext/phar/stream.c
	ext/phar/util.c
 2013-11-05 19:29:13 +08:00
Xinchen Hui
63dba7ec9d Remove outdate codes, make it clearer, although just a bit.. 2013-11-05 18:47:12 +08:00
Xinchen Hui
15eabbb436 Merge branch 'PHP-5.5' 2013-11-04 14:43:30 +08:00
Xinchen Hui
3d4ef50dd7 Fixed coredump due to abnormal implemention of phar 2013-11-04 14:42:54 +08:00
Felipe Pena
d23f089fb9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed possible NULL ptr dereference
 2013-10-20 09:04:36 -02:00
Felipe Pena
5b0560efc3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed possible NULL ptr dereference
 2013-10-20 09:04:27 -02:00
Felipe Pena
52555a7894 - Fixed possible NULL ptr dereference 2013-10-20 09:04:24 -02:00
Xinchen Hui
065bbeb83f Merge branch 'PHP-5.5' 2013-10-18 10:34:59 +08:00
Xinchen Hui
4417421ab6 Retruning SUCCESS/FAILURE instead of int 2013-10-18 10:33:53 +08:00
Xinchen Hui
a1a7522105 Merge branch 'PHP-5.5' 2013-10-17 12:25:01 +08:00
Xinchen Hui
06994a419d Add ability of alias resolving (it cause problem while work with opcache) 2013-10-17 12:23:09 +08:00
Nikita Popov
db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov
e6b228332f Remove PHAR_(Z)STR* usages 2013-09-13 21:49:09 +02:00
Nikita Popov
39bd738fbf Remove version checks in phar 
No need to keep around compatability code for PHP 5.0 and PHP 6.
 2013-09-13 21:47:59 +02:00
Andrey Hristov
92d27ccb05 Constify streams API and a few other calls down the rabbit hole. 
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
 2013-07-30 12:49:36 +02:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Pierre Joye
7ec2e5314e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:45:56 +02:00
Pierre Joye
ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00