1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Commit Graph

283 Commits

Author SHA1 Message Date
Keyur Govande 415d077e08 Merge branch 'PHP-5.5'
* PHP-5.5: (276 commits)
  Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
  Fix "passing NULL to non-pointer argument" warnings in intl
  Remove support for cloning generators
  Removed deprecated check
  Fix whitespace issue in the SOAP test
  Fix SOAP test
  Forgot to fix the test on 5.4
  Exclude Travis build for 5.3 and 5.4
  Fix tests after addition of ^ (xor) operator to ini
  Fix Bug #64545:	PHP Error in ef93a93ee2
  Attempt to fix SKIP
  This will PHP 5.3.25
  Typo fix (greater then => greater than)
  don't optimize script if it's not going to be cached
  Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
  Fixed issue #78 (incorrect file path validation)
  Fix test on Mac (\D shows up)
  Add test for #64529
  will be 5.4.15
  ...
2013-03-29 14:44:35 +00:00
Anatol Belski ec25e99193 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reworked the changes for bug #64452
2013-03-23 21:00:46 +01:00
Anatol Belski 04b492a5fe Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00
Anatol Belski 638c4b89b7 Reworked the changes for bug #64452 2013-03-23 20:57:59 +01:00
Anatol Belski 0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
Anatol Belski 06a526be3e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Stanislav Malyshev 4c293bfe91 Merge branch 'PHP-5.5'
* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Stanislav Malyshev 0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00
Joey Smith c3acefd9ea Fix a typo in the ZipArchive error messages 2013-01-08 14:18:31 -07:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Anatoliy Belsky d304527253 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
2012-08-21 13:24:54 +02:00
Anatoliy Belsky 92153dcfe3 Added test for bug #51353. It'll be skipped by default and must be
activated manually.
2012-08-21 13:22:00 +02:00
Johannes Schlüter b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Anatoliy Belsky 34bd1c941b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  sync zip ext version with pecl
2012-06-19 17:17:11 +02:00
Anatoliy Belsky e793539678 sync zip ext version with pecl 2012-06-19 17:15:56 +02:00
Anatoliy Belsky c56ff2bf75 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Reverted the BC fix regarding to #57905, test adopted
2012-06-17 16:10:56 +02:00
Anatoliy Belsky d3780f1f90 Reverted the BC fix regarding to #57905, test adopted
New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.
2012-06-17 16:04:36 +02:00
Anatoliy Belsky d24d5b62c1 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  set current versions for libzip and zip ext
2012-06-07 22:37:32 +02:00
Anatoliy Belsky baacc2cb13 set current versions for libzip and zip ext 2012-06-07 22:32:03 +02:00
Anatoliy Belsky 5ebdc46aa0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  zip windows fixes
  fixed bc break related to #57905
  fixed a bit overlooked from the last libzip port
  brought the fix for #47667 back
  fixed zip entry freeing
  rechecked the merged libzip, took also the indents from the original to avoid confusion next time
  fixed a double freeing crash
  fixed header include
  initial libzip upgrade patch to 0.10.1
  - BFN

Conflicts:
	NEWS
2012-06-07 21:06:31 +02:00
Anatoliy Belsky bde0e8c2a1 zip windows fixes 2012-06-07 21:01:32 +02:00
Anatoliy Belsky 8ca457f64d fixed bc break related to #57905 2012-06-07 21:01:32 +02:00
Anatoliy Belsky e883892664 fixed a bit overlooked from the last libzip port 2012-06-07 21:01:32 +02:00
Anatoliy Belsky b8cdc731b8 brought the fix for #47667 back 2012-06-07 21:01:32 +02:00
Anatoliy Belsky a37e84e549 fixed zip entry freeing 2012-06-07 21:01:32 +02:00
Anatoliy Belsky f4a44f18b8 rechecked the merged libzip, took also the indents from the original to
avoid confusion next time
2012-06-07 21:01:31 +02:00
Anatoliy Belsky a39bcfc5ee fixed a double freeing crash 2012-06-07 21:01:31 +02:00
Anatoliy Belsky 9a2365412e fixed header include 2012-06-07 21:01:31 +02:00
Anatoliy Belsky 335a11b14b initial libzip upgrade patch to 0.10.1 2012-06-07 21:01:31 +02:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Ilia Alshanetsky 172d037068 Removed unreachable code (stream == NULL check is done already) 2011-09-21 19:08:30 +00:00
Hannes Magnusson a6c07ae0d3 Fix cleanup routines 2011-09-07 12:05:19 +00:00
Hannes Magnusson 04044dd07e Fix cleanup routines 2011-09-07 12:05:19 +00:00
Shein Alexey 920fa567bd Removed old (< 5.3) version of test and cleaned up the actual version. 2011-09-02 17:41:39 +00:00
Shein Alexey 258591bdc6 Removed old (< 5.3) version of test and cleaned up the actual version. 2011-09-02 17:41:39 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena 32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena 1c24911a46 - Fixed bug #54681 (addGlob() crashes on invalid flags) 2011-05-07 01:58:26 +00:00
Felipe Pena c11e307ae0 - Fixed bug #54681 (addGlob() crashes on invalid flags) 2011-05-07 01:58:26 +00:00
Pierre Joye 5b521b71a2 - Fixed bug #53893 (Wrong return value for ZipArchive::extractTo()) 2011-02-07 16:20:16 +00:00
Pierre Joye 169c5dc2b7 - Fixed bug #53893 (Wrong return value for ZipArchive::extractTo()) 2011-02-07 16:20:16 +00:00
Adam Harvey 07fb5ca429 Change the way HAVE_GLOB is dealt with in ext/zip per IRC conversation with
Pierre.
2011-02-04 11:51:29 +00:00
Adam Harvey 793cfe1376 Change the way HAVE_GLOB is dealt with in ext/zip per IRC conversation with
Pierre.
2011-02-04 11:51:29 +00:00
Adam Harvey fcc7922ff1 Fix bug #53923 (Zip functions assume HAVE_GLOB is defined). 2011-02-04 10:50:42 +00:00
Adam Harvey 4bf6559ed0 Fix bug #53923 (Zip functions assume HAVE_GLOB is defined). 2011-02-04 10:50:42 +00:00